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.
Unified · Split
| @@ -45,5 +45,3 @@ OBJS-$(CONFIG_VP9_SUPERFRAME_BSF) += bsf/vp9_superframe.o · 44 unmodified lines | |||
| 45 | OBJS-$(CONFIG_VP9_SUPERFRAME_SPLIT_BSF) += bsf/vp9_superframe_split.o | 45 | OBJS-$(CONFIG_VP9_SUPERFRAME_SPLIT_BSF) += bsf/vp9_superframe_split.o |
| 46 | OBJS-$(CONFIG_VVC_METADATA_BSF) += bsf/h266_metadata.o | 46 | OBJS-$(CONFIG_VVC_METADATA_BSF) += bsf/h266_metadata.o |
| 47 | OBJS-$(CONFIG_VVC_MP4TOANNEXB_BSF) += bsf/vvc_mp4toannexb.o | 47 | OBJS-$(CONFIG_VVC_MP4TOANNEXB_BSF) += bsf/vvc_mp4toannexb.o |
| 48 | |||
| 49 | libavcodec/bsf/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/ | ||
| @@ -19,14 +19,14 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "adts_header.h" | 22 | #include "libavcodec/adts_header.h" |
| 23 | #include "adts_parser.h" | 23 | #include "libavcodec/adts_parser.h" |
| 24 | #include "bsf.h" | 24 | #include "libavcodec/bsf.h" |
| 25 | #include "bsf_internal.h" | 25 | #include "libavcodec/bsf_internal.h" |
| 26 | #include "put_bits.h" | 26 | #include "libavcodec/put_bits.h" |
| 27 | #include "get_bits.h" | 27 | #include "libavcodec/get_bits.h" |
| 28 | #include "mpeg4audio.h" | 28 | #include "libavcodec/mpeg4audio.h" |
| 29 | #include "mpeg4audio_copy_pce.h" | 29 | #include "libavcodec/mpeg4audio_copy_pce.h" |
| 30 | 30 | ||
| 31 | typedef struct AACBSFContext { | 31 | typedef struct AACBSFContext { |
| 32 | int first_frame_done; | 32 | int first_frame_done; |
| @@ -18,10 +18,10 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "bsf.h" | 21 | #include "libavcodec/bsf.h" |
| 22 | #include "bsf_internal.h" | 22 | #include "libavcodec/bsf_internal.h" |
| 23 | #include "cbs.h" | 23 | #include "libavcodec/cbs.h" |
| 24 | #include "cbs_av1.h" | 24 | #include "libavcodec/cbs_av1.h" |
| 25 | 25 | ||
| 26 | typedef struct AV1FMergeContext { | 26 | typedef struct AV1FMergeContext { |
| 27 | CodedBitstreamContext *input; | 27 | CodedBitstreamContext *input; |
| @@ -32,10 +32,10 @@ · 31 unmodified lines | |||
| 32 | 32 | ||
| 33 | #include "libavutil/avassert.h" | 33 | #include "libavutil/avassert.h" |
| 34 | 34 | ||
| 35 | #include "bsf.h" | 35 | #include "libavcodec/bsf.h" |
| 36 | #include "bsf_internal.h" | 36 | #include "libavcodec/bsf_internal.h" |
| 37 | #include "cbs.h" | 37 | #include "libavcodec/cbs.h" |
| 38 | #include "cbs_av1.h" | 38 | #include "libavcodec/cbs_av1.h" |
| 39 | 39 | ||
| 40 | typedef struct AV1FSplitContext { | 40 | typedef struct AV1FSplitContext { |
| 41 | AVPacket *buffer_pkt; | 41 | AVPacket *buffer_pkt; |
| @@ -19,11 +19,11 @@ · 18 unmodified lines | |||
| 19 | #include "libavutil/common.h" | 19 | #include "libavutil/common.h" |
| 20 | #include "libavutil/opt.h" | 20 | #include "libavutil/opt.h" |
| 21 | 21 | ||
| 22 | #include "bsf.h" | 22 | #include "libavcodec/bsf.h" |
| 23 | #include "bsf_internal.h" | 23 | #include "libavcodec/bsf_internal.h" |
| 24 | #include "cbs.h" | 24 | #include "libavcodec/cbs.h" |
| 25 | #include "cbs_bsf.h" | 25 | #include "libavcodec/cbs_bsf.h" |
| 26 | #include "cbs_av1.h" | 26 | #include "libavcodec/cbs_av1.h" |
| 27 | 27 | ||
| 28 | typedef struct AV1MetadataContext { | 28 | typedef struct AV1MetadataContext { |
| 29 | CBSBSFContext common; | 29 | CBSBSFContext common; |
| @@ -19,8 +19,8 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "bsf.h" | 22 | #include "libavcodec/bsf.h" |
| 23 | #include "bsf_internal.h" | 23 | #include "libavcodec/bsf_internal.h" |
| 24 | 24 | ||
| 25 | static int chomp_filter(AVBSFContext *ctx, AVPacket *pkt) | 25 | static int chomp_filter(AVBSFContext *ctx, AVPacket *pkt) |
| 26 | { | 26 | { |
| @@ -18,10 +18,10 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "bsf.h" | 21 | #include "libavcodec/bsf.h" |
| 22 | #include "bsf_internal.h" | 22 | #include "libavcodec/bsf_internal.h" |
| 23 | #include "bytestream.h" | 23 | #include "libavcodec/bytestream.h" |
| 24 | #include "dca_syncwords.h" | 24 | #include "libavcodec/dca_syncwords.h" |
| 25 | 25 | ||
| 26 | static int dca_core_filter(AVBSFContext *ctx, AVPacket *pkt) | 26 | static int dca_core_filter(AVBSFContext *ctx, AVPacket *pkt) |
| 27 | { | 27 | { |
| @@ -28,12 +28,12 @@ · 27 unmodified lines | |||
| 28 | #include "libavutil/mem.h" | 28 | #include "libavutil/mem.h" |
| 29 | #include "libavutil/tree.h" | 29 | #include "libavutil/tree.h" |
| 30 | 30 | ||
| 31 | #include "bsf.h" | 31 | #include "libavcodec/bsf.h" |
| 32 | #include "bsf_internal.h" | 32 | #include "libavcodec/bsf_internal.h" |
| 33 | #include "cbs.h" | 33 | #include "libavcodec/cbs.h" |
| 34 | #include "cbs_h264.h" | 34 | #include "libavcodec/cbs_h264.h" |
| 35 | #include "h264_parse.h" | 35 | #include "libavcodec/h264_parse.h" |
| 36 | #include "h264_ps.h" | 36 | #include "libavcodec/h264_ps.h" |
| 37 | 37 | ||
| 38 | typedef struct DTS2PTSNode { | 38 | typedef struct DTS2PTSNode { |
| 39 | int64_t dts; | 39 | int64_t dts; |
| @@ -20,8 +20,8 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include <string.h> | 21 | #include <string.h> |
| 22 | 22 | ||
| 23 | #include "bsf.h" | 23 | #include "libavcodec/bsf.h" |
| 24 | #include "bsf_internal.h" | 24 | #include "libavcodec/bsf_internal.h" |
| 25 | 25 | ||
| 26 | #include "libavutil/log.h" | 26 | #include "libavutil/log.h" |
| 27 | #include "libavutil/opt.h" | 27 | #include "libavutil/opt.h" |
| @@ -18,8 +18,8 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "bsf.h" | 21 | #include "libavcodec/bsf.h" |
| 22 | #include "bsf_internal.h" | 22 | #include "libavcodec/bsf_internal.h" |
| 23 | #include "libavutil/colorspace.h" | 23 | #include "libavutil/colorspace.h" |
| 24 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 25 | #include "libavutil/opt.h" | 25 | #include "libavutil/opt.h" |
| @@ -18,10 +18,10 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "bsf.h" | 21 | #include "libavcodec/bsf.h" |
| 22 | #include "bsf_internal.h" | 22 | #include "libavcodec/bsf_internal.h" |
| 23 | #include "get_bits.h" | 23 | #include "libavcodec/get_bits.h" |
| 24 | #include "ac3_parser_internal.h" | 24 | #include "libavcodec/ac3_parser_internal.h" |
| 25 | 25 | ||
| 26 | static int eac3_core_filter(AVBSFContext *ctx, AVPacket *pkt) | 26 | static int eac3_core_filter(AVBSFContext *ctx, AVPacket *pkt) |
| 27 | { | 27 | { |
| @@ -18,13 +18,13 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | #include "libavutil/mem.h" | 20 | #include "libavutil/mem.h" |
| 21 | #include "get_bits.h" | 21 | #include "libavcodec/get_bits.h" |
| 22 | #include "bsf.h" | 22 | #include "libavcodec/bsf.h" |
| 23 | #include "bsf_internal.h" | 23 | #include "libavcodec/bsf_internal.h" |
| 24 | 24 | ||
| 25 | #include "evc.h" | 25 | #include "libavcodec/evc.h" |
| 26 | #include "evc_parse.h" | 26 | #include "libavcodec/evc_parse.h" |
| 27 | #include "evc_ps.h" | 27 | #include "libavcodec/evc_ps.h" |
| 28 | 28 | ||
| 29 | // Access unit data | 29 | // Access unit data |
| 30 | typedef struct AccessUnitBuffer { | 30 | typedef struct AccessUnitBuffer { |
| @@ -22,17 +22,17 @@ · 21 unmodified lines | |||
| 22 | #include "libavutil/mem.h" | 22 | #include "libavutil/mem.h" |
| 23 | #include "libavutil/opt.h" | 23 | #include "libavutil/opt.h" |
| 24 | 24 | ||
| 25 | #include "av1.h" | 25 | #include "libavcodec/av1.h" |
| 26 | #include "av1_parse.h" | 26 | #include "libavcodec/av1_parse.h" |
| 27 | #include "bsf.h" | 27 | #include "libavcodec/bsf.h" |
| 28 | #include "bsf_internal.h" | 28 | #include "libavcodec/bsf_internal.h" |
| 29 | #include "bytestream.h" | 29 | #include "libavcodec/bytestream.h" |
| 30 | #include "h2645_parse.h" | 30 | #include "libavcodec/h2645_parse.h" |
| 31 | #include "h264.h" | 31 | #include "libavcodec/h264.h" |
| 32 | #include "hevc.h" | 32 | #include "libavcodec/hevc.h" |
| 33 | #include "startcode.h" | 33 | #include "libavcodec/startcode.h" |
| 34 | #include "vc1_common.h" | 34 | #include "libavcodec/vc1_common.h" |
| 35 | #include "vvc.h" | 35 | #include "libavcodec/vvc.h" |
| 36 | 36 | ||
| 37 | typedef struct ExtractExtradataContext { | 37 | typedef struct ExtractExtradataContext { |
| 38 | const AVClass *class; | 38 | const AVClass *class; |
| @@ -21,9 +21,9 @@ · 20 unmodified lines | |||
| 21 | #include "libavutil/mem.h" | 21 | #include "libavutil/mem.h" |
| 22 | #include "libavutil/opt.h" | 22 | #include "libavutil/opt.h" |
| 23 | 23 | ||
| 24 | #include "bsf.h" | 24 | #include "libavcodec/bsf.h" |
| 25 | #include "bsf_internal.h" | 25 | #include "libavcodec/bsf_internal.h" |
| 26 | #include "cbs.h" | 26 | #include "libavcodec/cbs.h" |
| 27 | 27 | ||
| 28 | 28 | ||
| 29 | typedef struct FilterUnitsContext { | 29 | typedef struct FilterUnitsContext { |
| @@ -22,16 +22,16 @@ · 21 unmodified lines | |||
| 22 | #include "libavutil/mem.h" | 22 | #include "libavutil/mem.h" |
| 23 | #include "libavutil/opt.h" | 23 | #include "libavutil/opt.h" |
| 24 | 24 | ||
| 25 | #include "bsf.h" | 25 | #include "libavcodec/bsf.h" |
| 26 | #include "bsf_internal.h" | 26 | #include "libavcodec/bsf_internal.h" |
| 27 | #include "cbs.h" | 27 | #include "libavcodec/cbs.h" |
| 28 | #include "cbs_bsf.h" | 28 | #include "libavcodec/cbs_bsf.h" |
| 29 | #include "cbs_h264.h" | 29 | #include "libavcodec/cbs_h264.h" |
| 30 | #include "cbs_sei.h" | 30 | #include "libavcodec/cbs_sei.h" |
| 31 | #include "h264.h" | 31 | #include "libavcodec/h264.h" |
| 32 | #include "h264_levels.h" | 32 | #include "libavcodec/h264_levels.h" |
| 33 | #include "h2645data.h" | 33 | #include "libavcodec/h2645data.h" |
| 34 | #include "sei.h" | 34 | #include "libavcodec/sei.h" |
| 35 | 35 | ||
| 36 | enum { | 36 | enum { |
| 37 | FLIP_HORIZONTAL = 1, | 37 | FLIP_HORIZONTAL = 1, |
| @@ -25,11 +25,11 @@ · 24 unmodified lines | |||
| 25 | #include "libavutil/intreadwrite.h" | 25 | #include "libavutil/intreadwrite.h" |
| 26 | #include "libavutil/mem.h" | 26 | #include "libavutil/mem.h" |
| 27 | 27 | ||
| 28 | #include "bsf.h" | 28 | #include "libavcodec/bsf.h" |
| 29 | #include "bsf_internal.h" | 29 | #include "libavcodec/bsf_internal.h" |
| 30 | #include "bytestream.h" | 30 | #include "libavcodec/bytestream.h" |
| 31 | #include "defs.h" | 31 | #include "libavcodec/defs.h" |
| 32 | #include "h264.h" | 32 | #include "libavcodec/h264.h" |
| 33 | 33 | ||
| 34 | typedef struct H264BSFContext { | 34 | typedef struct H264BSFContext { |
| 35 | uint8_t *sps; | 35 | uint8_t *sps; |
| @@ -20,14 +20,14 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include "libavutil/log.h" | 21 | #include "libavutil/log.h" |
| 22 | 22 | ||
| 23 | #include "bsf.h" | 23 | #include "libavcodec/bsf.h" |
| 24 | #include "bsf_internal.h" | 24 | #include "libavcodec/bsf_internal.h" |
| 25 | #include "cbs.h" | 25 | #include "libavcodec/cbs.h" |
| 26 | #include "cbs_bsf.h" | 26 | #include "libavcodec/cbs_bsf.h" |
| 27 | #include "cbs_h264.h" | 27 | #include "libavcodec/cbs_h264.h" |
| 28 | #include "codec_id.h" | 28 | #include "libavcodec/codec_id.h" |
| 29 | #include "h264.h" | 29 | #include "libavcodec/h264.h" |
| 30 | #include "packet.h" | 30 | #include "libavcodec/packet.h" |
| 31 | 31 | ||
| 32 | #define NEW_GLOBAL_PIC_INIT_QP 26 | 32 | #define NEW_GLOBAL_PIC_INIT_QP 26 |
| 33 | 33 | ||
| @@ -19,14 +19,14 @@ · 18 unmodified lines | |||
| 19 | #include "libavutil/common.h" | 19 | #include "libavutil/common.h" |
| 20 | #include "libavutil/opt.h" | 20 | #include "libavutil/opt.h" |
| 21 | 21 | ||
| 22 | #include "bsf.h" | 22 | #include "libavcodec/bsf.h" |
| 23 | #include "bsf_internal.h" | 23 | #include "libavcodec/bsf_internal.h" |
| 24 | #include "cbs.h" | 24 | #include "libavcodec/cbs.h" |
| 25 | #include "cbs_bsf.h" | 25 | #include "libavcodec/cbs_bsf.h" |
| 26 | #include "cbs_h265.h" | 26 | #include "libavcodec/cbs_h265.h" |
| 27 | #include "h2645data.h" | 27 | #include "libavcodec/h2645data.h" |
| 28 | #include "hevc.h" | 28 | #include "libavcodec/hevc.h" |
| 29 | #include "h265_profile_level.h" | 29 | #include "libavcodec/h265_profile_level.h" |
| 30 | 30 | ||
| 31 | enum { | 31 | enum { |
| 32 | LEVEL_UNSET = -2, | 32 | LEVEL_UNSET = -2, |
| @@ -19,12 +19,12 @@ · 18 unmodified lines | |||
| 19 | #include "libavutil/common.h" | 19 | #include "libavutil/common.h" |
| 20 | #include "libavutil/opt.h" | 20 | #include "libavutil/opt.h" |
| 21 | 21 | ||
| 22 | #include "bsf.h" | 22 | #include "libavcodec/bsf.h" |
| 23 | #include "bsf_internal.h" | 23 | #include "libavcodec/bsf_internal.h" |
| 24 | #include "cbs.h" | 24 | #include "libavcodec/cbs.h" |
| 25 | #include "cbs_bsf.h" | 25 | #include "libavcodec/cbs_bsf.h" |
| 26 | #include "cbs_h266.h" | 26 | #include "libavcodec/cbs_h266.h" |
| 27 | #include "vvc.h" | 27 | #include "libavcodec/vvc.h" |
| 28 | 28 | ||
| 29 | #define IS_H266_SLICE(nut) (nut <= VVC_RASL_NUT || (nut >= VVC_IDR_W_RADL && nut <= VVC_GDR_NUT)) | 29 | #define IS_H266_SLICE(nut) (nut <= VVC_RASL_NUT || (nut >= VVC_IDR_W_RADL && nut <= VVC_GDR_NUT)) |
| 30 | 30 | ||
| @@ -25,10 +25,10 @@ · 24 unmodified lines | |||
| 25 | * extract one of the two textures of the HAQA | 25 | * extract one of the two textures of the HAQA |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include "bsf.h" | 28 | #include "libavcodec/bsf.h" |
| 29 | #include "bsf_internal.h" | 29 | #include "libavcodec/bsf_internal.h" |
| 30 | #include "bytestream.h" | 30 | #include "libavcodec/bytestream.h" |
| 31 | #include "hap.h" | 31 | #include "libavcodec/hap.h" |
| 32 | 32 | ||
| 33 | #include "libavutil/opt.h" | 33 | #include "libavutil/opt.h" |
| 34 | 34 | ||
| @@ -24,11 +24,11 @@ · 23 unmodified lines | |||
| 24 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 25 | #include "libavutil/mem.h" | 25 | #include "libavutil/mem.h" |
| 26 | 26 | ||
| 27 | #include "bsf.h" | 27 | #include "libavcodec/bsf.h" |
| 28 | #include "bsf_internal.h" | 28 | #include "libavcodec/bsf_internal.h" |
| 29 | #include "bytestream.h" | 29 | #include "libavcodec/bytestream.h" |
| 30 | #include "defs.h" | 30 | #include "libavcodec/defs.h" |
| 31 | #include "hevc.h" | 31 | #include "libavcodec/hevc.h" |
| 32 | 32 | ||
| 33 | #define MIN_HEVCC_LENGTH 23 | 33 | #define MIN_HEVCC_LENGTH 23 |
| 34 | 34 | ||
| @@ -25,9 +25,9 @@ · 24 unmodified lines | |||
| 25 | * modifies bitstream to fit in mov and be decoded by final cut pro decoder | 25 | * modifies bitstream to fit in mov and be decoded by final cut pro decoder |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include "bsf.h" | 28 | #include "libavcodec/bsf.h" |
| 29 | #include "bsf_internal.h" | 29 | #include "libavcodec/bsf_internal.h" |
| 30 | #include "bytestream.h" | 30 | #include "libavcodec/bytestream.h" |
| 31 | 31 | ||
| 32 | 32 | ||
| 33 | static int imx_dump_header(AVBSFContext *ctx, AVPacket *out) | 33 | static int imx_dump_header(AVBSFContext *ctx, AVPacket *out) |
| @@ -25,9 +25,9 @@ · 24 unmodified lines | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "libavutil/intreadwrite.h" | 27 | #include "libavutil/intreadwrite.h" |
| 28 | #include "bsf.h" | 28 | #include "libavcodec/bsf.h" |
| 29 | #include "bsf_internal.h" | 29 | #include "libavcodec/bsf_internal.h" |
| 30 | #include "bytestream.h" | 30 | #include "libavcodec/bytestream.h" |
| 31 | 31 | ||
| 32 | static av_cold int init(AVBSFContext *ctx) | 32 | static av_cold int init(AVBSFContext *ctx) |
| 33 | { | 33 | { |
| @@ -29,10 +29,10 @@ · 28 unmodified lines | |||
| 29 | #include "libavutil/error.h" | 29 | #include "libavutil/error.h" |
| 30 | #include "libavutil/intreadwrite.h" | 30 | #include "libavutil/intreadwrite.h" |
| 31 | 31 | ||
| 32 | #include "bsf.h" | 32 | #include "libavcodec/bsf.h" |
| 33 | #include "bsf_internal.h" | 33 | #include "libavcodec/bsf_internal.h" |
| 34 | #include "jpegtables.h" | 34 | #include "libavcodec/jpegtables.h" |
| 35 | #include "mjpeg.h" | 35 | #include "libavcodec/mjpeg.h" |
| 36 | 36 | ||
| 37 | static const uint8_t jpeg_header[] = { | 37 | static const uint8_t jpeg_header[] = { |
| 38 | 0xff, 0xd8, // SOI | 38 | 0xff, 0xd8, // SOI |
| @@ -25,10 +25,10 @@ · 24 unmodified lines | |||
| 25 | * modifies bitstream to be decoded by quicktime | 25 | * modifies bitstream to be decoded by quicktime |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include "bsf.h" | 28 | #include "libavcodec/bsf.h" |
| 29 | #include "bsf_internal.h" | 29 | #include "libavcodec/bsf_internal.h" |
| 30 | #include "bytestream.h" | 30 | #include "libavcodec/bytestream.h" |
| 31 | #include "mjpeg.h" | 31 | #include "libavcodec/mjpeg.h" |
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | static int mjpega_dump_header(AVBSFContext *ctx, AVPacket *out) | 34 | static int mjpega_dump_header(AVBSFContext *ctx, AVPacket *out) |
| @@ -20,8 +20,8 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include "libavutil/common.h" | 21 | #include "libavutil/common.h" |
| 22 | #include "libavutil/intreadwrite.h" | 22 | #include "libavutil/intreadwrite.h" |
| 23 | #include "bsf.h" | 23 | #include "libavcodec/bsf.h" |
| 24 | #include "bsf_internal.h" | 24 | #include "libavcodec/bsf_internal.h" |
| 25 | 25 | ||
| 26 | static int text2movsub(AVBSFContext *ctx, AVPacket *out) | 26 | static int text2movsub(AVBSFContext *ctx, AVPacket *out) |
| 27 | { | 27 | { |
| @@ -19,12 +19,12 @@ · 18 unmodified lines | |||
| 19 | #include "libavutil/common.h" | 19 | #include "libavutil/common.h" |
| 20 | #include "libavutil/opt.h" | 20 | #include "libavutil/opt.h" |
| 21 | 21 | ||
| 22 | #include "bsf.h" | 22 | #include "libavcodec/bsf.h" |
| 23 | #include "bsf_internal.h" | 23 | #include "libavcodec/bsf_internal.h" |
| 24 | #include "cbs.h" | 24 | #include "libavcodec/cbs.h" |
| 25 | #include "cbs_bsf.h" | 25 | #include "libavcodec/cbs_bsf.h" |
| 26 | #include "cbs_mpeg2.h" | 26 | #include "libavcodec/cbs_mpeg2.h" |
| 27 | #include "mpeg12.h" | 27 | #include "libavcodec/mpeg12.h" |
| 28 | 28 | ||
| 29 | typedef struct MPEG2MetadataContext { | 29 | typedef struct MPEG2MetadataContext { |
| 30 | CBSBSFContext common; | 30 | CBSBSFContext common; |
| @@ -19,10 +19,10 @@ · 18 unmodified lines | |||
| 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include "bsf.h" | 22 | #include "libavcodec/bsf.h" |
| 23 | #include "bsf_internal.h" | 23 | #include "libavcodec/bsf_internal.h" |
| 24 | #include "mpeg4videodefs.h" | 24 | #include "libavcodec/mpeg4videodefs.h" |
| 25 | #include "startcode.h" | 25 | #include "libavcodec/startcode.h" |
| 26 | 26 | ||
| 27 | typedef struct UnpackBFramesBSFContext { | 27 | typedef struct UnpackBFramesBSFContext { |
| 28 | AVBufferRef *b_frame_ref; | 28 | AVBufferRef *b_frame_ref; |
| @@ -20,8 +20,8 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include <stdlib.h> | 21 | #include <stdlib.h> |
| 22 | 22 | ||
| 23 | #include "bsf.h" | 23 | #include "libavcodec/bsf.h" |
| 24 | #include "bsf_internal.h" | 24 | #include "libavcodec/bsf_internal.h" |
| 25 | 25 | ||
| 26 | #include "libavutil/log.h" | 26 | #include "libavutil/log.h" |
| 27 | #include "libavutil/mem.h" | 27 | #include "libavutil/mem.h" |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | |||
| 21 | * Null bitstream filter -- pass the input through unchanged. | 21 | * Null bitstream filter -- pass the input through unchanged. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include "bsf_internal.h" | 24 | #include "libavcodec/bsf_internal.h" |
| 25 | 25 | ||
| 26 | const FFBitStreamFilter ff_null_bsf = { | 26 | const FFBitStreamFilter ff_null_bsf = { |
| 27 | .p.name = "null", | 27 | .p.name = "null", |
| @@ -16,8 +16,8 @@ · 15 unmodified lines | |||
| 16 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 16 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include "bsf.h" | 19 | #include "libavcodec/bsf.h" |
| 20 | #include "bsf_internal.h" | 20 | #include "libavcodec/bsf_internal.h" |
| 21 | #include "libavutil/intreadwrite.h" | 21 | #include "libavutil/intreadwrite.h" |
| 22 | #include "libavutil/opt.h" | 22 | #include "libavutil/opt.h" |
| 23 | 23 | ||
| @@ -18,8 +18,8 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "bsf.h" | 21 | #include "libavcodec/bsf.h" |
| 22 | #include "bsf_internal.h" | 22 | #include "libavcodec/bsf_internal.h" |
| 23 | #include "libavutil/avassert.h" | 23 | #include "libavutil/avassert.h" |
| 24 | #include "libavutil/opt.h" | 24 | #include "libavutil/opt.h" |
| 25 | 25 | ||
| @@ -30,8 +30,8 @@ · 29 unmodified lines | |||
| 30 | #include "libavutil/attributes.h" | 30 | #include "libavutil/attributes.h" |
| 31 | #include "libavutil/intreadwrite.h" | 31 | #include "libavutil/intreadwrite.h" |
| 32 | #include "libavutil/log.h" | 32 | #include "libavutil/log.h" |
| 33 | #include "bsf.h" | 33 | #include "libavcodec/bsf.h" |
| 34 | #include "bsf_internal.h" | 34 | #include "libavcodec/bsf_internal.h" |
| 35 | 35 | ||
| 36 | enum PGSSegmentType { | 36 | enum PGSSegmentType { |
| 37 | PALETTE_SEGMENT = 0x14, | 37 | PALETTE_SEGMENT = 0x14, |
| @@ -29,8 +29,8 @@ · 28 unmodified lines | |||
| 29 | #include "libavutil/intreadwrite.h" | 29 | #include "libavutil/intreadwrite.h" |
| 30 | #include "libavutil/opt.h" | 30 | #include "libavutil/opt.h" |
| 31 | 31 | ||
| 32 | #include "bsf.h" | 32 | #include "libavcodec/bsf.h" |
| 33 | #include "bsf_internal.h" | 33 | #include "libavcodec/bsf_internal.h" |
| 34 | 34 | ||
| 35 | typedef struct ProresMetadataContext { | 35 | typedef struct ProresMetadataContext { |
| 36 | const AVClass *class; | 36 | const AVClass *class; |
| @@ -21,13 +21,13 @@ · 20 unmodified lines | |||
| 21 | #include "libavutil/log.h" | 21 | #include "libavutil/log.h" |
| 22 | #include "libavutil/opt.h" | 22 | #include "libavutil/opt.h" |
| 23 | 23 | ||
| 24 | #include "av1_parse.h" | 24 | #include "libavcodec/av1_parse.h" |
| 25 | #include "bsf.h" | 25 | #include "libavcodec/bsf.h" |
| 26 | #include "bsf_internal.h" | 26 | #include "libavcodec/bsf_internal.h" |
| 27 | #include "h264.h" | 27 | #include "libavcodec/h264.h" |
| 28 | #include "hevc.h" | 28 | #include "libavcodec/hevc.h" |
| 29 | #include "startcode.h" | 29 | #include "libavcodec/startcode.h" |
| 30 | #include "vc1_common.h" | 30 | #include "libavcodec/vc1_common.h" |
| 31 | 31 | ||
| 32 | enum RemoveFreq { | 32 | enum RemoveFreq { |
| 33 | REMOVE_FREQ_KEYFRAME, | 33 | REMOVE_FREQ_KEYFRAME, |
| @@ -26,8 +26,8 @@ · 25 unmodified lines | |||
| 26 | #include "libavutil/opt.h" | 26 | #include "libavutil/opt.h" |
| 27 | #include "libavutil/eval.h" | 27 | #include "libavutil/eval.h" |
| 28 | 28 | ||
| 29 | #include "bsf.h" | 29 | #include "libavcodec/bsf.h" |
| 30 | #include "bsf_internal.h" | 30 | #include "libavcodec/bsf_internal.h" |
| 31 | 31 | ||
| 32 | static const char *const var_names[] = { | 32 | static const char *const var_names[] = { |
| 33 | "N", ///< frame number (starting at zero) | 33 | "N", ///< frame number (starting at zero) |
| @@ -20,8 +20,8 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include <inttypes.h> | 21 | #include <inttypes.h> |
| 22 | 22 | ||
| 23 | #include "bsf.h" | 23 | #include "libavcodec/bsf.h" |
| 24 | #include "bsf_internal.h" | 24 | #include "libavcodec/bsf_internal.h" |
| 25 | 25 | ||
| 26 | #include "libavutil/log.h" | 26 | #include "libavutil/log.h" |
| 27 | #include "libavutil/timestamp.h" | 27 | #include "libavutil/timestamp.h" |
| @@ -22,9 +22,9 @@ · 21 unmodified lines | |||
| 22 | #include "libavutil/avutil.h" | 22 | #include "libavutil/avutil.h" |
| 23 | #include "libavutil/log.h" | 23 | #include "libavutil/log.h" |
| 24 | 24 | ||
| 25 | #include "bsf.h" | 25 | #include "libavcodec/bsf.h" |
| 26 | #include "bsf_internal.h" | 26 | #include "libavcodec/bsf_internal.h" |
| 27 | #include "cbs.h" | 27 | #include "libavcodec/cbs.h" |
| 28 | 28 | ||
| 29 | 29 | ||
| 30 | typedef struct TraceHeadersContext { | 30 | typedef struct TraceHeadersContext { |
| @@ -18,11 +18,11 @@ · 17 unmodified lines | |||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include "bsf.h" | 21 | #include "libavcodec/bsf.h" |
| 22 | #include "bsf_internal.h" | 22 | #include "libavcodec/bsf_internal.h" |
| 23 | #include "get_bits.h" | 23 | #include "libavcodec/get_bits.h" |
| 24 | #include "mlp_parse.h" | 24 | #include "libavcodec/mlp_parse.h" |
| 25 | #include "mlp.h" | 25 | #include "libavcodec/mlp.h" |
| 26 | 26 | ||
| 27 | typedef struct AccessUnit { | 27 | typedef struct AccessUnit { |
| 28 | uint8_t bits[4]; | 28 | uint8_t bits[4]; |
| @@ -19,11 +19,11 @@ · 18 unmodified lines | |||
| 19 | #include "libavutil/log.h" | 19 | #include "libavutil/log.h" |
| 20 | #include "libavutil/opt.h" | 20 | #include "libavutil/opt.h" |
| 21 | 21 | ||
| 22 | #include "bsf.h" | 22 | #include "libavcodec/bsf.h" |
| 23 | #include "bsf_internal.h" | 23 | #include "libavcodec/bsf_internal.h" |
| 24 | #include "cbs.h" | 24 | #include "libavcodec/cbs.h" |
| 25 | #include "cbs_bsf.h" | 25 | #include "libavcodec/cbs_bsf.h" |
| 26 | #include "cbs_vp9.h" | 26 | #include "libavcodec/cbs_vp9.h" |
| 27 | 27 | ||
| 28 | typedef struct VP9MetadataContext { | 28 | typedef struct VP9MetadataContext { |
| 29 | CBSBSFContext common; | 29 | CBSBSFContext common; |
| @@ -21,10 +21,10 @@ · 20 unmodified lines | |||
| 21 | #include "libavutil/log.h" | 21 | #include "libavutil/log.h" |
| 22 | #include "libavutil/mem.h" | 22 | #include "libavutil/mem.h" |
| 23 | 23 | ||
| 24 | #include "bsf.h" | 24 | #include "libavcodec/bsf.h" |
| 25 | #include "bsf_internal.h" | 25 | #include "libavcodec/bsf_internal.h" |
| 26 | #include "get_bits.h" | 26 | #include "libavcodec/get_bits.h" |
| 27 | #include "put_bits.h" | 27 | #include "libavcodec/put_bits.h" |
| 28 | 28 | ||
| 29 | #define FRAME_SLOTS 8 | 29 | #define FRAME_SLOTS 8 |
| 30 | 30 | ||
| @@ -21,9 +21,9 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include "libavutil/avassert.h" | 22 | #include "libavutil/avassert.h" |
| 23 | 23 | ||
| 24 | #include "bsf.h" | 24 | #include "libavcodec/bsf.h" |
| 25 | #include "bsf_internal.h" | 25 | #include "libavcodec/bsf_internal.h" |
| 26 | #include "get_bits.h" | 26 | #include "libavcodec/get_bits.h" |
| 27 | 27 | ||
| 28 | #define MAX_CACHE 8 | 28 | #define MAX_CACHE 8 |
| 29 | typedef struct VP9BSFContext { | 29 | typedef struct VP9BSFContext { |
| @@ -24,10 +24,10 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #include <stddef.h> | 25 | #include <stddef.h> |
| 26 | 26 | ||
| 27 | #include "bsf.h" | 27 | #include "libavcodec/bsf.h" |
| 28 | #include "bsf_internal.h" | 28 | #include "libavcodec/bsf_internal.h" |
| 29 | #include "bytestream.h" | 29 | #include "libavcodec/bytestream.h" |
| 30 | #include "get_bits.h" | 30 | #include "libavcodec/get_bits.h" |
| 31 | 31 | ||
| 32 | typedef struct VP9SFSplitContext { | 32 | typedef struct VP9SFSplitContext { |
| 33 | AVPacket *buffer_pkt; | 33 | AVPacket *buffer_pkt; |
| @@ -24,11 +24,11 @@ · 23 unmodified lines | |||
| 24 | #include "libavutil/intreadwrite.h" | 24 | #include "libavutil/intreadwrite.h" |
| 25 | #include "libavutil/mem.h" | 25 | #include "libavutil/mem.h" |
| 26 | 26 | ||
| 27 | #include "bsf.h" | 27 | #include "libavcodec/bsf.h" |
| 28 | #include "bsf_internal.h" | 28 | #include "libavcodec/bsf_internal.h" |
| 29 | #include "bytestream.h" | 29 | #include "libavcodec/bytestream.h" |
| 30 | #include "defs.h" | 30 | #include "libavcodec/defs.h" |
| 31 | #include "vvc.h" | 31 | #include "libavcodec/vvc.h" |
| 32 | 32 | ||
| 33 | #define MIN_VVCC_LENGTH 23 | 33 | #define MIN_VVCC_LENGTH 23 |
| 34 | 34 | ||