admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update includes to use <> instead of ""

Browse Source 
Webrtc is build with FFmpeg sources on defined in the include path
through the -I flag, so they should be included this way instead. This
would otherwise cause a conflict when the chromium ffmpeg sources move
from third_party/ffmpeg/* to third_party/ffmpeg/src/*

BUG: chromium:329282834
Change-Id: Id8f7e91446bdc536db77e74388a73e51f5111ffc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/342820
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Ted (Chromium) Meyer <tmathmeyer@chromium.org>
Cr-Commit-Position: refs/heads/main@{#41899}
This commit is contained in:
Ted Meyer 2024-03-13 12:24:50 -07:00 committed by WebRTC LUCI CQ
parent fea41f540c
commit d1ba1dc9c7
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/video_coding/codecs/h264/h264_color_space.h
View File

@ -20,12 +20,12 @@
#error "See: bugs.webrtc.org/9213#c13."
#endif
#include "api/video/color_space.h"
extern "C" {
#include "third_party/ffmpeg/libavcodec/avcodec.h"
#include <libavcodec/avcodec.h>
} // extern "C"
#include "api/video/color_space.h"
namespace webrtc {
// Helper class for extracting color space information from H264 stream.

12
modules/video_coding/codecs/h264/h264_decoder_impl.cc
View File

@ -16,16 +16,16 @@
#include "modules/video_coding/codecs/h264/h264_decoder_impl.h"
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include <libavutil/imgutils.h>
} // extern "C"
#include <algorithm>
#include <limits>
#include <memory>
extern "C" {
#include "third_party/ffmpeg/libavcodec/avcodec.h"
#include "third_party/ffmpeg/libavformat/avformat.h"
#include "third_party/ffmpeg/libavutil/imgutils.h"
} // extern "C"
#include "api/video/color_space.h"
#include "api/video/i010_buffer.h"
#include "api/video/i420_buffer.h"

9
modules/video_coding/codecs/h264/h264_decoder_impl.h
View File

@ -21,10 +21,6 @@
#error "See: bugs.webrtc.org/9213#c13."
#endif
#include <memory>
#include "modules/video_coding/codecs/h264/include/h264.h"
// CAVEAT: According to ffmpeg docs for avcodec_send_packet, ffmpeg requires a
// few extra padding bytes after the end of input. And in addition, docs for
// AV_INPUT_BUFFER_PADDING_SIZE says "If the first 23 bits of the additional
@ -40,11 +36,14 @@
// passed to ffmpeg.
extern "C" {
#include "third_party/ffmpeg/libavcodec/avcodec.h"
#include <libavcodec/avcodec.h>
} // extern "C"
#include <memory>
#include "common_video/h264/h264_bitstream_parser.h"
#include "common_video/include/video_frame_buffer_pool.h"
#include "modules/video_coding/codecs/h264/include/h264.h"
namespace webrtc {