xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 12:09:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

set PKT_FLAG_KEY for Theora and OGM streams

Browse Source 
Originally committed as revision 11002 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2007-11-11 21:56:18 +00:00
parent 6865337f7b
commit e1a794b272
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/oggdec.c
View File

@ -377,6 +377,7 @@ ogg_packet (AVFormatContext * s, int *str, int *dstart, int *dsize)
} }
if (os->header > -1 && os->seq > os->header){ if (os->header > -1 && os->seq > os->header){
os->pflags = 0;
if (os->codec && os->codec->packet) if (os->codec && os->codec->packet)
os->codec->packet (s, idx); os->codec->packet (s, idx);
if (str) if (str)
@ -525,6 +526,8 @@ ogg_read_packet (AVFormatContext * s, AVPacket * pkt)
os->lastgp = -1; os->lastgp = -1;
} }
pkt->flags = os->pflags;
return psize; return psize;
} }

1
libavformat/oggdec.h
View File

@ -42,6 +42,7 @@ typedef struct ogg_stream {
unsigned int bufpos; unsigned int bufpos;
unsigned int pstart; unsigned int pstart;
unsigned int psize; unsigned int psize;
unsigned int pflags;
uint32_t serial; uint32_t serial;
uint32_t seq; uint32_t seq;
uint64_t granule, lastgp; uint64_t granule, lastgp;

3
libavformat/oggparseogm.c
View File

@ -134,6 +134,9 @@ ogm_packet(AVFormatContext *s, int idx)
uint8_t *p = os->buf + os->pstart; uint8_t *p = os->buf + os->pstart;
int lb; int lb;
if(*p & 8)
os->pflags |= PKT_FLAG_KEY;
lb = ((*p & 2) << 1) | ((*p >> 6) & 3); lb = ((*p & 2) << 1) | ((*p >> 6) & 3);
os->pstart += lb + 1; os->pstart += lb + 1;
os->psize -= lb + 1; os->psize -= lb + 1;

3
libavformat/oggparsetheora.c
View File

@ -124,6 +124,9 @@ theora_gptopts(AVFormatContext *ctx, int idx, uint64_t gp)
uint64_t iframe = gp >> thp->gpshift; uint64_t iframe = gp >> thp->gpshift;
uint64_t pframe = gp & thp->gpmask; uint64_t pframe = gp & thp->gpmask;
if(!pframe)
os->pflags |= PKT_FLAG_KEY;
return iframe + pframe; return iframe + pframe;
} }