diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2022-06-07 20:20:19 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2022-06-07 20:20:19 -0500 |
| commit | 878ab758d5d4c1ef7badf2bc20ebc7c67dc2165b (patch) | |
| tree | 3683d6df35e3618c0e7b456de7c749ca4c8c21a6 /dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | |
| parent | a621951327b0c19c0c24dfd9fd973f7bd13ae68f (diff) | |
| parent | cfb9884423faf741de03c5fcc72bf9ac8c6ada4d (diff) | |
| download | aura-central-878ab758d5d4c1ef7badf2bc20ebc7c67dc2165b.tar.gz | |
Merge branch 'TRUNK' into ARE-5.0
Diffstat (limited to 'dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp')
| -rw-r--r-- | dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp index f9e8a2d26..731e7c74c 100644 --- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp @@ -213,6 +213,14 @@ FFmpegVideoDecoder<LIBAV_VER>::DoDecode(MediaRawData* aSample, bool* aGotFrame) return DoDecode(aSample, inputData, inputSize, aGotFrame); } +static int64_t GetFramePts(AVFrame* aFrame) { +#if LIBAVCODEC_VERSION_MAJOR > 58 + return aFrame->pts; +#else + return aFrame->pkt_pts; +#endif +} + MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(MediaRawData* aSample, uint8_t* aData, int aSize, @@ -260,7 +268,7 @@ FFmpegVideoDecoder<LIBAV_VER>::DoDecode(MediaRawData* aSample, return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR, RESULT_DETAIL("avcodec_receive_frame error: %d", res)); } - MediaResult rv = CreateImage(mFrame->pkt_pos, mFrame->pkt_pts, + MediaResult rv = CreateImage(mFrame->pkt_pos, GetFramePts(mFrame), mFrame->pkt_duration); if (NS_FAILED(rv)) { return rv; @@ -291,9 +299,9 @@ FFmpegVideoDecoder<LIBAV_VER>::DoDecode(MediaRawData* aSample, FFMPEG_LOG("DoDecodeFrame:decode_video: rv=%d decoded=%d " "(Input: pts(%lld) dts(%lld) Output: pts(%lld) " - "opaque(%lld) pkt_pts(%lld) pkt_dts(%lld))", + "opaque(%lld) pts(%lld) pkt_dts(%lld))", bytesConsumed, decoded, packet.pts, packet.dts, mFrame->pts, - mFrame->reordered_opaque, mFrame->pkt_pts, mFrame->pkt_dts); + mFrame->reordered_opaque, mFrame->pts, mFrame->pkt_dts); if (bytesConsumed < 0) { return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR, @@ -308,7 +316,7 @@ FFmpegVideoDecoder<LIBAV_VER>::DoDecode(MediaRawData* aSample, } // If we've decoded a frame then we need to output it - int64_t pts = mPtsContext.GuessCorrectPts(mFrame->pkt_pts, mFrame->pkt_dts); + int64_t pts = mPtsContext.GuessCorrectPts(GetFramePts(mFrame), mFrame->pkt_dts); // Retrieve duration from dts. // We use the first entry found matching this dts (this is done to // handle damaged file with multiple frames with the same dts) |