Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apk
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
apk
Commits
5972d1d6
Commit
5972d1d6
authored
Aug 27, 2018
by
DrKLO
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fixes
parent
7e327c1e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
MediaController.java
...src/main/java/org/telegram/messenger/MediaController.java
+2
-2
BlockedUsersActivity.java
...j/src/main/java/org/telegram/ui/BlockedUsersActivity.java
+3
-3
InstantCameraView.java
...in/java/org/telegram/ui/Components/InstantCameraView.java
+2
-2
No files found.
TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java
View file @
5972d1d6
...
...
@@ -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
);
...
...
TMessagesProj/src/main/java/org/telegram/ui/BlockedUsersActivity.java
View file @
5972d1d6
...
...
@@ -105,7 +105,7 @@ public class BlockedUsersActivity extends BaseFragment implements NotificationCe
return
;
}
Bundle
args
=
new
Bundle
();
args
.
putInt
(
"user_id"
,
MessagesController
.
getInstance
(
currentAccount
).
blockedUsers
.
ge
t
(
position
));
args
.
putInt
(
"user_id"
,
MessagesController
.
getInstance
(
currentAccount
).
blockedUsers
.
keyA
t
(
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
.
ge
t
(
position
);
selectedUserId
=
MessagesController
.
getInstance
(
currentAccount
).
blockedUsers
.
keyA
t
(
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
.
ge
t
(
position
));
TLRPC
.
User
user
=
MessagesController
.
getInstance
(
currentAccount
).
getUser
(
MessagesController
.
getInstance
(
currentAccount
).
blockedUsers
.
keyA
t
(
position
));
if
(
user
!=
null
)
{
String
number
;
if
(
user
.
bot
)
{
...
...
TMessagesProj/src/main/java/org/telegram/ui/Components/InstantCameraView.java
View file @
5972d1d6
...
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment