mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-05 10:49:59 +02:00
flac parser: set duration instead of frame_size
This commit is contained in:
parent
e9cda85351
commit
c7f3f1c91e
@ -71,6 +71,7 @@ typedef struct FLACHeaderMarker {
|
|||||||
} FLACHeaderMarker;
|
} FLACHeaderMarker;
|
||||||
|
|
||||||
typedef struct FLACParseContext {
|
typedef struct FLACParseContext {
|
||||||
|
AVCodecParserContext *pc; /**< parent context */
|
||||||
AVCodecContext *avctx; /**< codec context pointer for logging */
|
AVCodecContext *avctx; /**< codec context pointer for logging */
|
||||||
FLACHeaderMarker *headers; /**< linked-list that starts at the first
|
FLACHeaderMarker *headers; /**< linked-list that starts at the first
|
||||||
CRC-8 verified header within buffer */
|
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->sample_rate = header->fi.samplerate;
|
||||||
fpc->avctx->channels = header->fi.channels;
|
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,
|
*poutbuf = flac_fifo_read_wrap(fpc, header->offset, *poutbuf_size,
|
||||||
&fpc->wrap_buf,
|
&fpc->wrap_buf,
|
||||||
&fpc->wrap_buf_allocated_size);
|
&fpc->wrap_buf_allocated_size);
|
||||||
@ -484,7 +485,7 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx,
|
|||||||
if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
|
if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
|
||||||
FLACFrameInfo fi;
|
FLACFrameInfo fi;
|
||||||
if (frame_header_is_valid(avctx, buf, &fi))
|
if (frame_header_is_valid(avctx, buf, &fi))
|
||||||
avctx->frame_size = fi.blocksize;
|
s->duration = fi.blocksize;
|
||||||
*poutbuf = buf;
|
*poutbuf = buf;
|
||||||
*poutbuf_size = buf_size;
|
*poutbuf_size = buf_size;
|
||||||
return 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",
|
av_log(avctx, AV_LOG_DEBUG, "Junk frame till offset %i\n",
|
||||||
fpc->best_header->offset);
|
fpc->best_header->offset);
|
||||||
|
|
||||||
/* Set frame_size to 0. It is unknown or invalid in a junk frame. */
|
/* Set duration to 0. It is unknown or invalid in a junk frame. */
|
||||||
avctx->frame_size = 0;
|
s->duration = 0;
|
||||||
*poutbuf_size = fpc->best_header->offset;
|
*poutbuf_size = fpc->best_header->offset;
|
||||||
*poutbuf = flac_fifo_read_wrap(fpc, 0, *poutbuf_size,
|
*poutbuf = flac_fifo_read_wrap(fpc, 0, *poutbuf_size,
|
||||||
&fpc->wrap_buf,
|
&fpc->wrap_buf,
|
||||||
@ -652,6 +653,7 @@ handle_error:
|
|||||||
static int flac_parse_init(AVCodecParserContext *c)
|
static int flac_parse_init(AVCodecParserContext *c)
|
||||||
{
|
{
|
||||||
FLACParseContext *fpc = c->priv_data;
|
FLACParseContext *fpc = c->priv_data;
|
||||||
|
fpc->pc = c;
|
||||||
/* There will generally be FLAC_MIN_HEADERS buffered in the fifo before
|
/* There will generally be FLAC_MIN_HEADERS buffered in the fifo before
|
||||||
it drains. This is allocated early to avoid slow reallocation. */
|
it drains. This is allocated early to avoid slow reallocation. */
|
||||||
fpc->fifo_buf = av_fifo_alloc(FLAC_AVG_FRAME_SIZE * (FLAC_MIN_HEADERS + 3));
|
fpc->fifo_buf = av_fifo_alloc(FLAC_AVG_FRAME_SIZE * (FLAC_MIN_HEADERS + 3));
|
||||||
|
Loading…
Reference in New Issue
Block a user