RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

h264: store current_sps_id inside the current sps 

In preparation for MVC support.
This commit is contained in:
Vittorio Giovara 2014-02-13 00:43:17 +01:00
parent 73e8fab31d
commit 3a05767028
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/h264.c
View File

@ -3414,12 +3414,11 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
return AVERROR_INVALIDDATA;
}
if (h->pps.sps_id != h->current_sps_id ||
if (h->pps.sps_id != h->sps.sps_id ||
h0->sps_buffers[h->pps.sps_id]->new) {
h0->sps_buffers[h->pps.sps_id]->new = 0;
h->current_sps_id = h->pps.sps_id;
h->sps = *h0->sps_buffers[h->pps.sps_id];
h->sps = *h0->sps_buffers[h->pps.sps_id];
if (h->bit_depth_luma != h->sps.bit_depth_luma ||
h->chroma_format_idc != h->sps.chroma_format_idc) {

2
libavcodec/h264.h
View File

@ -146,6 +146,7 @@ typedef enum {
* Sequence parameter set
*/
typedef struct SPS {
unsigned int sps_id;
int profile_idc;
int level_idc;
int chroma_format_idc;
@ -353,7 +354,6 @@ typedef struct H264Context {
ptrdiff_t mb_linesize; ///< may be equal to s->linesize or s->linesize * 2, for mbaff
ptrdiff_t mb_uvlinesize;
unsigned current_sps_id; ///< id of the current SPS
SPS sps; ///< current sps
/**

2
libavcodec/h264_ps.c
View File

@ -318,6 +318,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h)
if (!sps)
return AVERROR(ENOMEM);
sps->sps_id = sps_id;
sps->time_offset_length = 24;
sps->profile_idc = profile_idc;
sps->constraint_set_flags = constraint_set_flags;
@ -504,7 +505,6 @@ int ff_h264_decode_seq_parameter_set(H264Context *h)
av_free(h->sps_buffers[sps_id]);
h->sps_buffers[sps_id] = sps;
h->sps = *sps;
h->current_sps_id = sps_id;
return 0;