har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bsf: use standard include paths

Browse Source 
Removes the special -I flag specified in the avcodec/bsf/ subdirectory.

This makes code copy-pastable to other parts of the ffmpeg codebase, as
well as simplifying the build script.

It also reduces ambiguity, since there are many instances of same-named
header files existing in both libavformat/ and libavcodec/
subdirectories.

Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Andrew Kelley 2024-04-09 14:13:34 -07:00 committed by James Almer
parent 9dbc9a0f97
commit 41b73ae883
44 changed files with 184 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/bsf/Makefile
View File

@ -45,5 +45,3 @@ OBJS-$(CONFIG_VP9_SUPERFRAME_BSF) += bsf/vp9_superframe.o
OBJS-$(CONFIG_VP9_SUPERFRAME_SPLIT_BSF) += bsf/vp9_superframe_split.o
OBJS-$(CONFIG_VVC_METADATA_BSF) += bsf/h266_metadata.o
OBJS-$(CONFIG_VVC_MP4TOANNEXB_BSF) += bsf/vvc_mp4toannexb.o
libavcodec/bsf/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/

16
libavcodec/bsf/aac_adtstoasc.c
View File

@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "adts_header.h"
#include "adts_parser.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "put_bits.h"
#include "get_bits.h"
#include "mpeg4audio.h"
#include "mpeg4audio_copy_pce.h"
#include "libavcodec/adts_header.h"
#include "libavcodec/adts_parser.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/put_bits.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/mpeg4audio.h"
#include "libavcodec/mpeg4audio_copy_pce.h"
typedef struct AACBSFContext {
int first_frame_done;

8
libavcodec/bsf/av1_frame_merge.c
View File

@ -18,10 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "bsf.h"
#include "bsf_internal.h"
#include "cbs.h"
#include "cbs_av1.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/cbs.h"
#include "libavcodec/cbs_av1.h"
typedef struct AV1FMergeContext {
CodedBitstreamContext *input;

8
libavcodec/bsf/av1_frame_split.c
View File

@ -32,10 +32,10 @@
#include "libavutil/avassert.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "cbs.h"
#include "cbs_av1.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/cbs.h"
#include "libavcodec/cbs_av1.h"
typedef struct AV1FSplitContext {
AVPacket *buffer_pkt;

10
libavcodec/bsf/av1_metadata.c
View File

@ -19,11 +19,11 @@
#include "libavutil/common.h"
#include "libavutil/opt.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "cbs.h"
#include "cbs_bsf.h"
#include "cbs_av1.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/cbs.h"
#include "libavcodec/cbs_bsf.h"
#include "libavcodec/cbs_av1.h"
typedef struct AV1MetadataContext {
CBSBSFContext common;

4
libavcodec/bsf/chomp.c
View File

@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "bsf.h"
#include "bsf_internal.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
static int chomp_filter(AVBSFContext *ctx, AVPacket *pkt)
{

8
libavcodec/bsf/dca_core.c
View File

@ -18,10 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "bsf.h"
#include "bsf_internal.h"
#include "bytestream.h"
#include "dca_syncwords.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/dca_syncwords.h"
static int dca_core_filter(AVBSFContext *ctx, AVPacket *pkt)
{

12
libavcodec/bsf/dts2pts.c
View File

@ -28,12 +28,12 @@
#include "libavutil/mem.h"
#include "libavutil/tree.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "cbs.h"
#include "cbs_h264.h"
#include "h264_parse.h"
#include "h264_ps.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/cbs.h"
#include "libavcodec/cbs_h264.h"
#include "libavcodec/h264_parse.h"
#include "libavcodec/h264_ps.h"
typedef struct DTS2PTSNode {
int64_t dts;

4
libavcodec/bsf/dump_extradata.c
View File

@ -20,8 +20,8 @@
#include <string.h>
#include "bsf.h"
#include "bsf_internal.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"

4
libavcodec/bsf/dv_error_marker.c
View File

@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "bsf.h"
#include "bsf_internal.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavutil/colorspace.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"

8
libavcodec/bsf/eac3_core.c
View File

@ -18,10 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "bsf.h"
#include "bsf_internal.h"
#include "get_bits.h"
#include "ac3_parser_internal.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/ac3_parser_internal.h"
static int eac3_core_filter(AVBSFContext *ctx, AVPacket *pkt)
{

12
libavcodec/bsf/evc_frame_merge.c
View File

@ -18,13 +18,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/mem.h"
#include "get_bits.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "evc.h"
#include "evc_parse.h"
#include "evc_ps.h"
#include "libavcodec/evc.h"
#include "libavcodec/evc_parse.h"
#include "libavcodec/evc_ps.h"
// Access unit data
typedef struct AccessUnitBuffer {

22
libavcodec/bsf/extract_extradata.c
View File

@ -22,17 +22,17 @@
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "av1.h"
#include "av1_parse.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "bytestream.h"
#include "h2645_parse.h"
#include "h264.h"
#include "hevc.h"
#include "startcode.h"
#include "vc1_common.h"
#include "vvc.h"
#include "libavcodec/av1.h"
#include "libavcodec/av1_parse.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/h2645_parse.h"
#include "libavcodec/h264.h"
#include "libavcodec/hevc.h"
#include "libavcodec/startcode.h"
#include "libavcodec/vc1_common.h"
#include "libavcodec/vvc.h"
typedef struct ExtractExtradataContext {
const AVClass *class;

6
libavcodec/bsf/filter_units.c
View File

@ -21,9 +21,9 @@
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "cbs.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/cbs.h"
typedef struct FilterUnitsContext {

20
libavcodec/bsf/h264_metadata.c
View File

@ -22,16 +22,16 @@
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "cbs.h"
#include "cbs_bsf.h"
#include "cbs_h264.h"
#include "cbs_sei.h"
#include "h264.h"
#include "h264_levels.h"
#include "h2645data.h"
#include "sei.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/cbs.h"
#include "libavcodec/cbs_bsf.h"
#include "libavcodec/cbs_h264.h"
#include "libavcodec/cbs_sei.h"
#include "libavcodec/h264.h"
#include "libavcodec/h264_levels.h"
#include "libavcodec/h2645data.h"
#include "libavcodec/sei.h"
enum {
FLIP_HORIZONTAL = 1,

10
libavcodec/bsf/h264_mp4toannexb.c
View File

@ -25,11 +25,11 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "bytestream.h"
#include "defs.h"
#include "h264.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/defs.h"
#include "libavcodec/h264.h"
typedef struct H264BSFContext {
uint8_t *sps;

16
libavcodec/bsf/h264_redundant_pps.c
View File

@ -20,14 +20,14 @@
#include "libavutil/log.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "cbs.h"
#include "cbs_bsf.h"
#include "cbs_h264.h"
#include "codec_id.h"
#include "h264.h"
#include "packet.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/cbs.h"
#include "libavcodec/cbs_bsf.h"
#include "libavcodec/cbs_h264.h"
#include "libavcodec/codec_id.h"
#include "libavcodec/h264.h"
#include "libavcodec/packet.h"
#define NEW_GLOBAL_PIC_INIT_QP 26

16
libavcodec/bsf/h265_metadata.c
View File

@ -19,14 +19,14 @@
#include "libavutil/common.h"
#include "libavutil/opt.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "cbs.h"
#include "cbs_bsf.h"
#include "cbs_h265.h"
#include "h2645data.h"
#include "hevc.h"
#include "h265_profile_level.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/cbs.h"
#include "libavcodec/cbs_bsf.h"
#include "libavcodec/cbs_h265.h"
#include "libavcodec/h2645data.h"
#include "libavcodec/hevc.h"
#include "libavcodec/h265_profile_level.h"
enum {
LEVEL_UNSET = -2,

12
libavcodec/bsf/h266_metadata.c
View File

@ -19,12 +19,12 @@
#include "libavutil/common.h"
#include "libavutil/opt.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "cbs.h"
#include "cbs_bsf.h"
#include "cbs_h266.h"
#include "vvc.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/cbs.h"
#include "libavcodec/cbs_bsf.h"
#include "libavcodec/cbs_h266.h"
#include "libavcodec/vvc.h"
#define IS_H266_SLICE(nut) (nut <= VVC_RASL_NUT || (nut >= VVC_IDR_W_RADL && nut <= VVC_GDR_NUT))

8
libavcodec/bsf/hapqa_extract.c
View File

@ -25,10 +25,10 @@
* extract one of the two textures of the HAQA
*/
#include "bsf.h"
#include "bsf_internal.h"
#include "bytestream.h"
#include "hap.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/hap.h"
#include "libavutil/opt.h"

10
libavcodec/bsf/hevc_mp4toannexb.c
View File

@ -24,11 +24,11 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "bytestream.h"
#include "defs.h"
#include "hevc.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/defs.h"
#include "libavcodec/hevc.h"
#define MIN_HEVCC_LENGTH 23

6
libavcodec/bsf/imx_dump_header.c
View File

@ -25,9 +25,9 @@
* modifies bitstream to fit in mov and be decoded by final cut pro decoder
*/
#include "bsf.h"
#include "bsf_internal.h"
#include "bytestream.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/bytestream.h"
static int imx_dump_header(AVBSFContext *ctx, AVPacket *out)

6
libavcodec/bsf/media100_to_mjpegb.c
View File

@ -25,9 +25,9 @@
*/
#include "libavutil/intreadwrite.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "bytestream.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/bytestream.h"
static av_cold int init(AVBSFContext *ctx)
{

8
libavcodec/bsf/mjpeg2jpeg.c
View File

@ -29,10 +29,10 @@
#include "libavutil/error.h"
#include "libavutil/intreadwrite.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "jpegtables.h"
#include "mjpeg.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/jpegtables.h"
#include "libavcodec/mjpeg.h"
static const uint8_t jpeg_header[] = {
0xff, 0xd8, // SOI

8
libavcodec/bsf/mjpega_dump_header.c
View File

@ -25,10 +25,10 @@
* modifies bitstream to be decoded by quicktime
*/
#include "bsf.h"
#include "bsf_internal.h"
#include "bytestream.h"
#include "mjpeg.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/mjpeg.h"
static int mjpega_dump_header(AVBSFContext *ctx, AVPacket *out)

4
libavcodec/bsf/movsub.c
View File

@ -20,8 +20,8 @@
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
static int text2movsub(AVBSFContext *ctx, AVPacket *out)
{

12
libavcodec/bsf/mpeg2_metadata.c
View File

@ -19,12 +19,12 @@
#include "libavutil/common.h"
#include "libavutil/opt.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "cbs.h"
#include "cbs_bsf.h"
#include "cbs_mpeg2.h"
#include "mpeg12.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/cbs.h"
#include "libavcodec/cbs_bsf.h"
#include "libavcodec/cbs_mpeg2.h"
#include "libavcodec/mpeg12.h"
typedef struct MPEG2MetadataContext {
CBSBSFContext common;

8
libavcodec/bsf/mpeg4_unpack_bframes.c
View File

@ -19,10 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "bsf.h"
#include "bsf_internal.h"
#include "mpeg4videodefs.h"
#include "startcode.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/mpeg4videodefs.h"
#include "libavcodec/startcode.h"
typedef struct UnpackBFramesBSFContext {
AVBufferRef *b_frame_ref;

4
libavcodec/bsf/noise.c
View File

@ -20,8 +20,8 @@
#include <stdlib.h>
#include "bsf.h"
#include "bsf_internal.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavutil/log.h"
#include "libavutil/mem.h"

2
libavcodec/bsf/null.c
View File

@ -21,7 +21,7 @@
* Null bitstream filter -- pass the input through unchanged.
*/
#include "bsf_internal.h"
#include "libavcodec/bsf_internal.h"
const FFBitStreamFilter ff_null_bsf = {
.p.name = "null",

4
libavcodec/bsf/opus_metadata.c
View File

@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "bsf.h"
#include "bsf_internal.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"

4
libavcodec/bsf/pcm_rechunk.c
View File

@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "bsf.h"
#include "bsf_internal.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavutil/avassert.h"
#include "libavutil/opt.h"

4
libavcodec/bsf/pgs_frame_merge.c
View File

@ -30,8 +30,8 @@
#include "libavutil/attributes.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/log.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
enum PGSSegmentType {
PALETTE_SEGMENT = 0x14,

4
libavcodec/bsf/prores_metadata.c
View File

@ -29,8 +29,8 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
typedef struct ProresMetadataContext {
const AVClass *class;

14
libavcodec/bsf/remove_extradata.c
View File

@ -21,13 +21,13 @@
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "av1_parse.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "h264.h"
#include "hevc.h"
#include "startcode.h"
#include "vc1_common.h"
#include "libavcodec/av1_parse.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/h264.h"
#include "libavcodec/hevc.h"
#include "libavcodec/startcode.h"
#include "libavcodec/vc1_common.h"
enum RemoveFreq {
REMOVE_FREQ_KEYFRAME,

4
libavcodec/bsf/setts.c
View File

@ -26,8 +26,8 @@
#include "libavutil/opt.h"
#include "libavutil/eval.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
static const char *const var_names[] = {
"N", ///< frame number (starting at zero)

4
libavcodec/bsf/showinfo.c
View File

@ -20,8 +20,8 @@
#include <inttypes.h>
#include "bsf.h"
#include "bsf_internal.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavutil/log.h"
#include "libavutil/timestamp.h"

6
libavcodec/bsf/trace_headers.c
View File

@ -22,9 +22,9 @@
#include "libavutil/avutil.h"
#include "libavutil/log.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "cbs.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/cbs.h"
typedef struct TraceHeadersContext {

10
libavcodec/bsf/truehd_core.c
View File

@ -18,11 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "bsf.h"
#include "bsf_internal.h"
#include "get_bits.h"
#include "mlp_parse.h"
#include "mlp.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/mlp_parse.h"
#include "libavcodec/mlp.h"
typedef struct AccessUnit {
uint8_t bits[4];

10
libavcodec/bsf/vp9_metadata.c
View File

@ -19,11 +19,11 @@
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "cbs.h"
#include "cbs_bsf.h"
#include "cbs_vp9.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/cbs.h"
#include "libavcodec/cbs_bsf.h"
#include "libavcodec/cbs_vp9.h"
typedef struct VP9MetadataContext {
CBSBSFContext common;

8
libavcodec/bsf/vp9_raw_reorder.c
View File

@ -21,10 +21,10 @@
#include "libavutil/log.h"
#include "libavutil/mem.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "get_bits.h"
#include "put_bits.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/put_bits.h"
#define FRAME_SLOTS 8

6
libavcodec/bsf/vp9_superframe.c
View File

@ -21,9 +21,9 @@
#include "libavutil/avassert.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "get_bits.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/get_bits.h"
#define MAX_CACHE 8
typedef struct VP9BSFContext {

8
libavcodec/bsf/vp9_superframe_split.c
View File

@ -24,10 +24,10 @@
#include <stddef.h>
#include "bsf.h"
#include "bsf_internal.h"
#include "bytestream.h"
#include "get_bits.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/get_bits.h"
typedef struct VP9SFSplitContext {
AVPacket *buffer_pkt;

10
libavcodec/bsf/vvc_mp4toannexb.c
View File

@ -24,11 +24,11 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
#include "bsf.h"
#include "bsf_internal.h"
#include "bytestream.h"
#include "defs.h"
#include "vvc.h"
#include "libavcodec/bsf.h"
#include "libavcodec/bsf_internal.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/defs.h"
#include "libavcodec/vvc.h"
#define MIN_VVCC_LENGTH 23