mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474'
* commit '9404a47a2d1df418946a338938eb6cdb3afed474': h264: move parser-only variables to their own context Conflicts: libavcodec/h264_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
6e57d2da90
|
@ -1116,13 +1116,6 @@ static void flush_dpb(AVCodecContext *avctx)
|
||||||
|
|
||||||
h->mb_x = h->mb_y = 0;
|
h->mb_x = h->mb_y = 0;
|
||||||
|
|
||||||
h->parse_context.state = -1;
|
|
||||||
h->parse_context.frame_start_found = 0;
|
|
||||||
h->parse_context.overread = 0;
|
|
||||||
h->parse_context.overread_index = 0;
|
|
||||||
h->parse_context.index = 0;
|
|
||||||
h->parse_context.last_index = 0;
|
|
||||||
|
|
||||||
ff_h264_free_tables(h, 1);
|
ff_h264_free_tables(h, 1);
|
||||||
h->context_initialized = 0;
|
h->context_initialized = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -343,7 +343,6 @@ typedef struct H264Context {
|
||||||
H264DSPContext h264dsp;
|
H264DSPContext h264dsp;
|
||||||
H264ChromaContext h264chroma;
|
H264ChromaContext h264chroma;
|
||||||
H264QpelContext h264qpel;
|
H264QpelContext h264qpel;
|
||||||
ParseContext parse_context;
|
|
||||||
GetBitContext gb;
|
GetBitContext gb;
|
||||||
ERContext er;
|
ERContext er;
|
||||||
|
|
||||||
|
@ -564,7 +563,6 @@ typedef struct H264Context {
|
||||||
*/
|
*/
|
||||||
int is_avc; ///< this flag is != 0 if codec is avc1
|
int is_avc; ///< this flag is != 0 if codec is avc1
|
||||||
int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4)
|
int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4)
|
||||||
int got_first; ///< this flag is != 0 if we've parsed a frame
|
|
||||||
|
|
||||||
int bit_depth_luma; ///< luma bit depth from sps to detect changes
|
int bit_depth_luma; ///< luma bit depth from sps to detect changes
|
||||||
int chroma_format_idc; ///< chroma format from sps to detect changes
|
int chroma_format_idc; ///< chroma format from sps to detect changes
|
||||||
|
|
|
@ -34,15 +34,22 @@
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "mpegutils.h"
|
#include "mpegutils.h"
|
||||||
|
|
||||||
|
typedef struct H264ParseContext {
|
||||||
|
H264Context h;
|
||||||
|
ParseContext pc;
|
||||||
|
int got_first;
|
||||||
|
} H264ParseContext;
|
||||||
|
|
||||||
static int h264_find_frame_end(H264Context *h, const uint8_t *buf,
|
|
||||||
|
static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf,
|
||||||
int buf_size)
|
int buf_size)
|
||||||
{
|
{
|
||||||
|
H264Context *h = &p->h;
|
||||||
int i, j;
|
int i, j;
|
||||||
uint32_t state;
|
uint32_t state;
|
||||||
ParseContext *pc = &h->parse_context;
|
ParseContext *pc = &p->pc;
|
||||||
int next_avc= h->is_avc ? 0 : buf_size;
|
|
||||||
|
|
||||||
|
int next_avc= h->is_avc ? 0 : buf_size;
|
||||||
// mb_addr= pc->mb_addr - 1;
|
// mb_addr= pc->mb_addr - 1;
|
||||||
state = pc->state;
|
state = pc->state;
|
||||||
if (state > 13)
|
if (state > 13)
|
||||||
|
@ -124,7 +131,8 @@ found:
|
||||||
|
|
||||||
static int scan_mmco_reset(AVCodecParserContext *s)
|
static int scan_mmco_reset(AVCodecParserContext *s)
|
||||||
{
|
{
|
||||||
H264Context *h = s->priv_data;
|
H264ParseContext *p = s->priv_data;
|
||||||
|
H264Context *h = &p->h;
|
||||||
|
|
||||||
h->slice_type_nos = s->pict_type & 3;
|
h->slice_type_nos = s->pict_type & 3;
|
||||||
|
|
||||||
|
@ -204,7 +212,8 @@ static inline int parse_nal_units(AVCodecParserContext *s,
|
||||||
AVCodecContext *avctx,
|
AVCodecContext *avctx,
|
||||||
const uint8_t * const buf, int buf_size)
|
const uint8_t * const buf, int buf_size)
|
||||||
{
|
{
|
||||||
H264Context *h = s->priv_data;
|
H264ParseContext *p = s->priv_data;
|
||||||
|
H264Context *h = &p->h;
|
||||||
int buf_index, next_avc;
|
int buf_index, next_avc;
|
||||||
unsigned int pps_id;
|
unsigned int pps_id;
|
||||||
unsigned int slice_type;
|
unsigned int slice_type;
|
||||||
|
@ -455,12 +464,13 @@ static int h264_parse(AVCodecParserContext *s,
|
||||||
const uint8_t **poutbuf, int *poutbuf_size,
|
const uint8_t **poutbuf, int *poutbuf_size,
|
||||||
const uint8_t *buf, int buf_size)
|
const uint8_t *buf, int buf_size)
|
||||||
{
|
{
|
||||||
H264Context *h = s->priv_data;
|
H264ParseContext *p = s->priv_data;
|
||||||
ParseContext *pc = &h->parse_context;
|
H264Context *h = &p->h;
|
||||||
|
ParseContext *pc = &p->pc;
|
||||||
int next;
|
int next;
|
||||||
|
|
||||||
if (!h->got_first) {
|
if (!p->got_first) {
|
||||||
h->got_first = 1;
|
p->got_first = 1;
|
||||||
if (avctx->extradata_size) {
|
if (avctx->extradata_size) {
|
||||||
h->avctx = avctx;
|
h->avctx = avctx;
|
||||||
// must be done like in decoder, otherwise opening the parser,
|
// must be done like in decoder, otherwise opening the parser,
|
||||||
|
@ -476,7 +486,7 @@ static int h264_parse(AVCodecParserContext *s,
|
||||||
if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
|
if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
|
||||||
next = buf_size;
|
next = buf_size;
|
||||||
} else {
|
} else {
|
||||||
next = h264_find_frame_end(h, buf, buf_size);
|
next = h264_find_frame_end(p, buf, buf_size);
|
||||||
|
|
||||||
if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
|
if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
|
||||||
*poutbuf = NULL;
|
*poutbuf = NULL;
|
||||||
|
@ -486,7 +496,7 @@ static int h264_parse(AVCodecParserContext *s,
|
||||||
|
|
||||||
if (next < 0 && next != END_NOT_FOUND) {
|
if (next < 0 && next != END_NOT_FOUND) {
|
||||||
av_assert1(pc->last_index + next >= 0);
|
av_assert1(pc->last_index + next >= 0);
|
||||||
h264_find_frame_end(h, &pc->buffer[pc->last_index + next], -next); // update state
|
h264_find_frame_end(p, &pc->buffer[pc->last_index + next], -next); // update state
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -549,8 +559,9 @@ static int h264_split(AVCodecContext *avctx,
|
||||||
|
|
||||||
static void close(AVCodecParserContext *s)
|
static void close(AVCodecParserContext *s)
|
||||||
{
|
{
|
||||||
H264Context *h = s->priv_data;
|
H264ParseContext *p = s->priv_data;
|
||||||
ParseContext *pc = &h->parse_context;
|
H264Context *h = &p->h;
|
||||||
|
ParseContext *pc = &p->pc;
|
||||||
|
|
||||||
av_freep(&pc->buffer);
|
av_freep(&pc->buffer);
|
||||||
ff_h264_free_context(h);
|
ff_h264_free_context(h);
|
||||||
|
@ -558,7 +569,8 @@ static void close(AVCodecParserContext *s)
|
||||||
|
|
||||||
static av_cold int init(AVCodecParserContext *s)
|
static av_cold int init(AVCodecParserContext *s)
|
||||||
{
|
{
|
||||||
H264Context *h = s->priv_data;
|
H264ParseContext *p = s->priv_data;
|
||||||
|
H264Context *h = &p->h;
|
||||||
h->thread_context[0] = h;
|
h->thread_context[0] = h;
|
||||||
h->slice_context_count = 1;
|
h->slice_context_count = 1;
|
||||||
ff_h264dsp_init(&h->h264dsp, 8, 1);
|
ff_h264dsp_init(&h->h264dsp, 8, 1);
|
||||||
|
@ -567,7 +579,7 @@ static av_cold int init(AVCodecParserContext *s)
|
||||||
|
|
||||||
AVCodecParser ff_h264_parser = {
|
AVCodecParser ff_h264_parser = {
|
||||||
.codec_ids = { AV_CODEC_ID_H264 },
|
.codec_ids = { AV_CODEC_ID_H264 },
|
||||||
.priv_data_size = sizeof(H264Context),
|
.priv_data_size = sizeof(H264ParseContext),
|
||||||
.parser_init = init,
|
.parser_init = init,
|
||||||
.parser_parse = h264_parse,
|
.parser_parse = h264_parse,
|
||||||
.parser_close = close,
|
.parser_close = close,
|
||||||
|
|
Loading…
Reference in New Issue