| Message ID | CAHGNH3HTczkcXYoTmsPAvSMT0wW23mv9cye4-j2-f_E2+2G+qA@mail.gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/dpx: Read alternative frame rate from television header | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/configure | warning | Failed to apply patch |
On Fri, Aug 14, 2020 at 01:30:24AM -0700, Harry Mallon wrote: > Signed-off-by: Harry Mallon <harry.mallon@codex.online> > --- > libavcodec/dpx.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c > index b1833ed9ef..694deb27c5 100644 > --- a/libavcodec/dpx.c > +++ b/libavcodec/dpx.c > @@ -216,10 +216,22 @@ static int decode_frame(AVCodecContext *avctx, > else > avctx->sample_aspect_ratio = (AVRational){ 0, 1 }; > > + /* preferred frame rate from Motion-picture film header */ > if (offset >= 1724 + 4) { > buf = avpkt->data + 1724; > i = read32(&buf, endian); > - if(i) { > + if(i && i != 0xFFFFFFFF) { > + AVRational q = av_d2q(av_int2float(i), 4096); > + if (q.num > 0 && q.den > 0) > + avctx->framerate = q; > + } > + } > + > + /* alternative frame rate from television header */ > + if (!(avctx->framerate.num && avctx->framerate.den) && offset >= > 1940 + 4) { > + buf = avpkt->data + 1940; Theres a linebreak which will break the diff (possibly from the used editor or mail user agent) [...]
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index b1833ed9ef..694deb27c5 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -216,10 +216,22 @@ static int decode_frame(AVCodecContext *avctx, else avctx->sample_aspect_ratio = (AVRational){ 0, 1 }; + /* preferred frame rate from Motion-picture film header */ if (offset >= 1724 + 4) { buf = avpkt->data + 1724; i = read32(&buf, endian); - if(i) { + if(i && i != 0xFFFFFFFF) { + AVRational q = av_d2q(av_int2float(i), 4096); + if (q.num > 0 && q.den > 0) + avctx->framerate = q; + } + } + + /* alternative frame rate from television header */ + if (!(avctx->framerate.num && avctx->framerate.den) && offset >= 1940 + 4) { + buf = avpkt->data + 1940; + i = read32(&buf, endian); + if(i && i != 0xFFFFFFFF) { AVRational q = av_d2q(av_int2float(i), 4096); if (q.num > 0 && q.den > 0)
Signed-off-by: Harry Mallon <harry.mallon@codex.online> --- libavcodec/dpx.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) avctx->framerate = q;