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
c7f3f1c9
Commit
c7f3f1c9
authored
Jan 13, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
flac parser: set duration instead of frame_size
parent
e9cda853
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
flac_parser.c
libavcodec/flac_parser.c
+6
-4
No files found.
libavcodec/flac_parser.c
View file @
c7f3f1c9
...
...
@@ -71,6 +71,7 @@ typedef struct FLACHeaderMarker {
}
FLACHeaderMarker
;
typedef
struct
FLACParseContext
{
AVCodecParserContext
*
pc
;
/**< parent context */
AVCodecContext
*
avctx
;
/**< codec context pointer for logging */
FLACHeaderMarker
*
headers
;
/**< linked-list that starts at the first
CRC-8 verified header within buffer */
...
...
@@ -458,7 +459,7 @@ static int get_best_header(FLACParseContext* fpc, const uint8_t **poutbuf,
fpc
->
avctx
->
sample_rate
=
header
->
fi
.
samplerate
;
fpc
->
avctx
->
channels
=
header
->
fi
.
channels
;
fpc
->
avctx
->
frame_size
=
header
->
fi
.
blocksize
;
fpc
->
pc
->
duration
=
header
->
fi
.
blocksize
;
*
poutbuf
=
flac_fifo_read_wrap
(
fpc
,
header
->
offset
,
*
poutbuf_size
,
&
fpc
->
wrap_buf
,
&
fpc
->
wrap_buf_allocated_size
);
...
...
@@ -484,7 +485,7 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx,
if
(
s
->
flags
&
PARSER_FLAG_COMPLETE_FRAMES
)
{
FLACFrameInfo
fi
;
if
(
frame_header_is_valid
(
avctx
,
buf
,
&
fi
))
avctx
->
frame_size
=
fi
.
blocksize
;
s
->
duration
=
fi
.
blocksize
;
*
poutbuf
=
buf
;
*
poutbuf_size
=
buf_size
;
return
buf_size
;
...
...
@@ -630,8 +631,8 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx,
av_log
(
avctx
,
AV_LOG_DEBUG
,
"Junk frame till offset %i
\n
"
,
fpc
->
best_header
->
offset
);
/* Set
frame_size
to 0. It is unknown or invalid in a junk frame. */
avctx
->
frame_size
=
0
;
/* Set
duration
to 0. It is unknown or invalid in a junk frame. */
s
->
duration
=
0
;
*
poutbuf_size
=
fpc
->
best_header
->
offset
;
*
poutbuf
=
flac_fifo_read_wrap
(
fpc
,
0
,
*
poutbuf_size
,
&
fpc
->
wrap_buf
,
...
...
@@ -652,6 +653,7 @@ handle_error:
static
int
flac_parse_init
(
AVCodecParserContext
*
c
)
{
FLACParseContext
*
fpc
=
c
->
priv_data
;
fpc
->
pc
=
c
;
/* There will generally be FLAC_MIN_HEADERS buffered in the fifo before
it drains. This is allocated early to avoid slow reallocation. */
fpc
->
fifo_buf
=
av_fifo_alloc
(
FLAC_AVG_FRAME_SIZE
*
(
FLAC_MIN_HEADERS
+
3
));
...
...
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