diff --git a/dom/media/platforms/agnostic/AOMDecoder.cpp b/dom/media/platforms/agnostic/AOMDecoder.cpp index 693b98c949..e82871eeaa 100644 --- a/dom/media/platforms/agnostic/AOMDecoder.cpp +++ b/dom/media/platforms/agnostic/AOMDecoder.cpp @@ -246,6 +246,8 @@ AOMDecoder::DoDecode(MediaRawData* aSample) LOG("Unhandled colorspace %d", img->mc); break; } + b.mColorRange = img->range == AOM_CR_FULL_RANGE ? ColorRange::FULL + : ColorRange::LIMITED; RefPtr v = VideoData::CreateAndCopyData(mInfo, diff --git a/dom/media/platforms/agnostic/VPXDecoder.cpp b/dom/media/platforms/agnostic/VPXDecoder.cpp index ebc85c9e51..7c094f8d1c 100644 --- a/dom/media/platforms/agnostic/VPXDecoder.cpp +++ b/dom/media/platforms/agnostic/VPXDecoder.cpp @@ -173,6 +173,7 @@ VPXDecoder::DoDecode(MediaRawData* aSample) return YUVColorSpace::BT601; } }(); + // TODO: need a newer libvpx to support full color range RefPtr v = VideoData::CreateAndCopyData(mInfo, diff --git a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp index 426e9f74b2..5232a600c3 100644 --- a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp +++ b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp @@ -154,6 +154,7 @@ FFmpegLibWrapper::Link() AV_FUNC(av_frame_free, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58)) AV_FUNC(av_frame_unref, (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58)) AV_FUNC_OPTION(av_frame_get_colorspace, AV_FUNC_AVUTIL_ALL) + AV_FUNC_OPTION(av_frame_get_color_range, AV_FUNC_AVUTIL_ALL) #undef AV_FUNC #undef AV_FUNC_OPTION diff --git a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.h b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.h index b968edd326..807984b01d 100644 --- a/dom/media/platforms/ffmpeg/FFmpegLibWrapper.h +++ b/dom/media/platforms/ffmpeg/FFmpegLibWrapper.h @@ -87,6 +87,7 @@ struct FFmpegLibWrapper // libavutil optional int (*av_frame_get_colorspace)(const AVFrame *frame); + int (*av_frame_get_color_range)(const AVFrame *frame); PRLibrary* mAVCodecLib; PRLibrary* mAVUtilLib; diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp index 12317ca6e4..6bf9c0ec31 100644 --- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp @@ -381,6 +381,11 @@ FFmpegVideoDecoder::CreateImage(int64_t aOffset, int64_t aPts, break; } } + if (mLib->av_frame_get_color_range) { + auto range = mLib->av_frame_get_color_range(mFrame); + b.mColorRange = range == AVCOL_RANGE_JPEG ? ColorRange::FULL : ColorRange::LIMITED; + } + RefPtr v = VideoData::CreateAndCopyData(mInfo, mImageContainer,