Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
Linshizhi
ffmpeg.wasm-core
Commits
cfa3c265
Commit
cfa3c265
authored
Oct 06, 2016
by
Matthieu Bouron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/mediacodecdec: rename dequeued_buffer_nb to output_buffer_count
parent
a458ed65
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
mediacodecdec.c
libavcodec/mediacodecdec.c
+3
-3
mediacodecdec.h
libavcodec/mediacodecdec.h
+1
-1
No files found.
libavcodec/mediacodecdec.c
View file @
cfa3c265
...
...
@@ -437,7 +437,7 @@ static int mediacodec_dec_flush_codec(AVCodecContext *avctx, MediaCodecDecContex
FFAMediaCodec
*
codec
=
s
->
codec
;
int
status
;
s
->
dequeued_buffer_nb
=
0
;
s
->
output_buffer_count
=
0
;
s
->
draining
=
0
;
s
->
flushing
=
0
;
...
...
@@ -630,7 +630,7 @@ int ff_mediacodec_dec_decode(AVCodecContext *avctx, MediaCodecDecContext *s,
/* If the codec is flushing or need to be flushed, block for a fair
* amount of time to ensure we got a frame */
output_dequeue_timeout_us
=
OUTPUT_DEQUEUE_BLOCK_TIMEOUT_US
;
}
else
if
(
s
->
dequeued_buffer_nb
==
0
)
{
}
else
if
(
s
->
output_buffer_count
==
0
)
{
/* If the codec hasn't produced any frames, do not block so we
* can push data to it as fast as possible, and get the first
* frame */
...
...
@@ -670,7 +670,7 @@ int ff_mediacodec_dec_decode(AVCodecContext *avctx, MediaCodecDecContext *s,
}
*
got_frame
=
1
;
s
->
dequeued_buffer_nb
++
;
s
->
output_buffer_count
++
;
}
else
{
status
=
ff_AMediaCodec_releaseOutputBuffer
(
codec
,
index
,
0
);
if
(
status
<
0
)
{
...
...
libavcodec/mediacodecdec.h
View file @
cfa3c265
...
...
@@ -59,7 +59,7 @@ typedef struct MediaCodecDecContext {
int
crop_left
;
int
crop_right
;
uint64_t
dequeued_buffer_nb
;
uint64_t
output_buffer_count
;
}
MediaCodecDecContext
;
...
...
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