OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2024-12-22 06:25:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bug fixes

Browse source
This commit is contained in:
DrKLO 2018-08-27 21:45:56 +03:00
parent 7e327c1e2c
commit 5972d1d69f
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java
View file

@ -3891,12 +3891,12 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener,
outputFormat.setInteger(MediaFormat.KEY_BIT_RATE, bitrate > 0 ? bitrate : 921600);
outputFormat.setInteger(MediaFormat.KEY_FRAME_RATE, framerate != 0 ? framerate : 25);
outputFormat.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, 10);
if (Build.VERSION.SDK_INT >= 21) {
/*if (Build.VERSION.SDK_INT >= 21) {
outputFormat.setInteger(MediaFormat.KEY_PROFILE, MediaCodecInfo.CodecProfileLevel.AVCProfileHigh);
if (Build.VERSION.SDK_INT >= 23) {
outputFormat.setInteger(MediaFormat.KEY_LEVEL, MediaCodecInfo.CodecProfileLevel.AVCLevel5);
}
}
}*/
if (Build.VERSION.SDK_INT < 18) {
outputFormat.setInteger("stride", resultWidth + 32);
outputFormat.setInteger("slice-height", resultHeight);

6
TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java
View file

@ -105,7 +105,7 @@ public class BlockedUsersActivity extends BaseFragment implements NotificationCe
return;
}
Bundle args = new Bundle();
args.putInt("user_id", MessagesController.getInstance(currentAccount).blockedUsers.get(position));
args.putInt("user_id", MessagesController.getInstance(currentAccount).blockedUsers.keyAt(position));
presentFragment(new ProfileActivity(args));
});
@ -113,7 +113,7 @@ public class BlockedUsersActivity extends BaseFragment implements NotificationCe
if (position >= MessagesController.getInstance(currentAccount).blockedUsers.size() || getParentActivity() == null) {
return true;
}
selectedUserId = MessagesController.getInstance(currentAccount).blockedUsers.get(position);
selectedUserId = MessagesController.getInstance(currentAccount).blockedUsers.keyAt(position);
AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
CharSequence[] items = new CharSequence[]{LocaleController.getString("Unblock", R.string.Unblock)};
@ -219,7 +219,7 @@ public class BlockedUsersActivity extends BaseFragment implements NotificationCe
@Override
public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
if (holder.getItemViewType() == 0) {
TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(MessagesController.getInstance(currentAccount).blockedUsers.get(position));
TLRPC.User user = MessagesController.getInstance(currentAccount).getUser(MessagesController.getInstance(currentAccount).blockedUsers.keyAt(position));
if (user != null) {
String number;
if (user.bot) {

4
TMessagesProj/src/main/java/org/telegram/ui/Components/InstantCameraView.java
View file

@ -1941,12 +1941,12 @@ public class InstantCameraView extends FrameLayout implements NotificationCenter
format.setInteger(MediaFormat.KEY_BIT_RATE, videoBitrate);
format.setInteger(MediaFormat.KEY_FRAME_RATE, FRAME_RATE);
format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, IFRAME_INTERVAL);
if (Build.VERSION.SDK_INT >= 21) {
/*if (Build.VERSION.SDK_INT >= 21) {
format.setInteger(MediaFormat.KEY_PROFILE, MediaCodecInfo.CodecProfileLevel.AVCProfileHigh);
if (Build.VERSION.SDK_INT >= 23) {
format.setInteger(MediaFormat.KEY_LEVEL, MediaCodecInfo.CodecProfileLevel.AVCLevel5);
}
}
}*/
videoEncoder.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
surface = videoEncoder.createInputSurface();