1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent f5fd2bbd77ef4b6554a7180c9c4768e64aca3b2a |
2 # Parent d1908d68e16e148fcc012caac881a03417eccc7e |
3 |
3 |
4 diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
4 diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
5 --- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
5 --- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
6 +++ b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
6 +++ b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
7 @@ -36,16 +36,17 @@ static inline SkMatrix SkEncodedOriginTo |
7 @@ -36,16 +36,17 @@ static inline SkMatrix SkEncodedOriginTo |
503 int I420BufferInterface::ChromaHeight() const { |
503 int I420BufferInterface::ChromaHeight() const { |
504 return (height() + 1) / 2; |
504 return (height() + 1) / 2; |
505 diff --git a/third_party/libwebrtc/api/video_codecs/video_codec.cc b/third_party/libwebrtc/api/video_codecs/video_codec.cc |
505 diff --git a/third_party/libwebrtc/api/video_codecs/video_codec.cc b/third_party/libwebrtc/api/video_codecs/video_codec.cc |
506 --- a/third_party/libwebrtc/api/video_codecs/video_codec.cc |
506 --- a/third_party/libwebrtc/api/video_codecs/video_codec.cc |
507 +++ b/third_party/libwebrtc/api/video_codecs/video_codec.cc |
507 +++ b/third_party/libwebrtc/api/video_codecs/video_codec.cc |
508 @@ -113,16 +113,17 @@ const char* CodecTypeToPayloadString(Vid |
508 @@ -126,16 +126,17 @@ const char* CodecTypeToPayloadString(Vid |
509 case kVideoCodecH264: |
|
510 return kPayloadNameH264; |
|
511 case kVideoCodecMultiplex: |
509 case kVideoCodecMultiplex: |
512 return kPayloadNameMultiplex; |
510 return kPayloadNameMultiplex; |
513 case kVideoCodecGeneric: |
511 case kVideoCodecGeneric: |
514 return kPayloadNameGeneric; |
512 return kPayloadNameGeneric; |
|
513 case kVideoCodecH265: |
|
514 return kPayloadNameH265; |
515 } |
515 } |
516 RTC_CHECK_NOTREACHED(); |
516 RTC_CHECK_NOTREACHED(); |
517 + return ""; |
517 + return ""; |
518 } |
518 } |
519 |
519 |
639 auto first_step = GetAdaptationDownStep(input_state, current_restrictions_); |
639 auto first_step = GetAdaptationDownStep(input_state, current_restrictions_); |
640 if (!absl::holds_alternative<RestrictionsWithCounters>(first_step)) { |
640 if (!absl::holds_alternative<RestrictionsWithCounters>(first_step)) { |
641 diff --git a/third_party/libwebrtc/call/rtp_payload_params.cc b/third_party/libwebrtc/call/rtp_payload_params.cc |
641 diff --git a/third_party/libwebrtc/call/rtp_payload_params.cc b/third_party/libwebrtc/call/rtp_payload_params.cc |
642 --- a/third_party/libwebrtc/call/rtp_payload_params.cc |
642 --- a/third_party/libwebrtc/call/rtp_payload_params.cc |
643 +++ b/third_party/libwebrtc/call/rtp_payload_params.cc |
643 +++ b/third_party/libwebrtc/call/rtp_payload_params.cc |
644 @@ -400,17 +400,17 @@ absl::optional<FrameDependencyStructure> |
644 @@ -405,17 +405,17 @@ absl::optional<FrameDependencyStructure> |
645 } |
|
646 return structure; |
645 return structure; |
647 } |
646 } |
648 case VideoCodecType::kVideoCodecAV1: |
647 case VideoCodecType::kVideoCodecAV1: |
649 case VideoCodecType::kVideoCodecH264: |
648 case VideoCodecType::kVideoCodecH264: |
|
649 case VideoCodecType::kVideoCodecH265: |
650 case VideoCodecType::kVideoCodecMultiplex: |
650 case VideoCodecType::kVideoCodecMultiplex: |
651 return absl::nullopt; |
651 return absl::nullopt; |
652 } |
652 } |
653 - RTC_DCHECK_NOTREACHED() << "Unsupported codec."; |
653 - RTC_DCHECK_NOTREACHED() << "Unsupported codec."; |
654 + RTC_CHECK_NOTREACHED(); |
654 + RTC_CHECK_NOTREACHED(); |
918 } |
918 } |
919 } |
919 } |
920 diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc |
920 diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc |
921 --- a/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc |
921 --- a/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc |
922 +++ b/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc |
922 +++ b/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc |
923 @@ -33,11 +33,12 @@ std::unique_ptr<VideoRtpDepacketizer> Cr |
923 @@ -36,11 +36,12 @@ std::unique_ptr<VideoRtpDepacketizer> Cr |
924 return std::make_unique<VideoRtpDepacketizerVp9>(); |
924 case kVideoCodecH265: |
925 case kVideoCodecAV1: |
925 // TODO(bugs.webrtc.org/13485): Implement VideoRtpDepacketizerH265. |
926 return std::make_unique<VideoRtpDepacketizerAv1>(); |
926 return nullptr; |
927 case kVideoCodecGeneric: |
927 case kVideoCodecGeneric: |
928 case kVideoCodecMultiplex: |
928 case kVideoCodecMultiplex: |
929 return std::make_unique<VideoRtpDepacketizerGeneric>(); |
929 return std::make_unique<VideoRtpDepacketizerGeneric>(); |
930 } |
930 } |
931 RTC_CHECK_NOTREACHED(); |
931 RTC_CHECK_NOTREACHED(); |