[FFmpeg-cvslog] Merge commit '251cbb44003caf179fb17afbb8a6c56643c2a646'
Clément Bœsch
git at videolan.org
Fri Jul 29 12:20:15 EEST 2016
ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Fri Jul 29 11:13:44 2016 +0200| [ecf65c30cf7545c72c0e27b32283fc9c55b03544] | committer: Clément Bœsch
Merge commit '251cbb44003caf179fb17afbb8a6c56643c2a646'
* commit '251cbb44003caf179fb17afbb8a6c56643c2a646':
h264: create a new header for common h264 definitions
Merged-by: Clément Bœsch <u at pkh.me>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ecf65c30cf7545c72c0e27b32283fc9c55b03544
---
libavcodec/h264.h | 45 ++++++++++++++++++++++++++++++++++++++++++
libavcodec/h264_parse.c | 1 +
libavcodec/h264_parser.c | 1 +
libavcodec/h264_refs.c | 1 +
libavcodec/h264_slice.c | 1 +
libavcodec/h264dec.c | 1 +
libavcodec/h264dec.h | 18 -----------------
libavcodec/omx.c | 2 +-
libavcodec/vaapi_encode_h264.c | 2 +-
libavformat/mxfenc.c | 2 +-
10 files changed, 53 insertions(+), 21 deletions(-)
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
new file mode 100644
index 0000000..72b133b
--- /dev/null
+++ b/libavcodec/h264.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * H.264 common definitions
+ */
+
+#ifndef AVCODEC_H264_H
+#define AVCODEC_H264_H
+
+/* NAL unit types */
+enum {
+ NAL_SLICE = 1,
+ NAL_DPA = 2,
+ NAL_DPB = 3,
+ NAL_DPC = 4,
+ NAL_IDR_SLICE = 5,
+ NAL_SEI = 6,
+ NAL_SPS = 7,
+ NAL_PPS = 8,
+ NAL_AUD = 9,
+ NAL_END_SEQUENCE = 10,
+ NAL_END_STREAM = 11,
+ NAL_FILLER_DATA = 12,
+ NAL_SPS_EXT = 13,
+ NAL_AUXILIARY_SLICE = 19,
+};
+
+#endif /* AVCODEC_H264_H */
diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c
index 052298b..5d1157e 100644
--- a/libavcodec/h264_parse.c
+++ b/libavcodec/h264_parse.c
@@ -19,6 +19,7 @@
#include "bytestream.h"
#include "get_bits.h"
#include "golomb.h"
+#include "h264.h"
#include "h264dec.h"
#include "h264_parse.h"
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index e2ca60f..34bd0e1 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -38,6 +38,7 @@
#include "get_bits.h"
#include "golomb.h"
+#include "h264.h"
#include "h264dec.h"
#include "h264_sei.h"
#include "h264data.h"
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 4246e87..e66f69a 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -30,6 +30,7 @@
#include "libavutil/avassert.h"
#include "internal.h"
#include "avcodec.h"
+#include "h264.h"
#include "h264dec.h"
#include "golomb.h"
#include "mpegutils.h"
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index e70f2ee..5c505a1 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -35,6 +35,7 @@
#include "cabac_functions.h"
#include "error_resilience.h"
#include "avcodec.h"
+#include "h264.h"
#include "h264dec.h"
#include "h264data.h"
#include "h264chroma.h"
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index 8e07e7e..511e78c 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -39,6 +39,7 @@
#include "cabac_functions.h"
#include "error_resilience.h"
#include "avcodec.h"
+#include "h264.h"
#include "h264dec.h"
#include "h2645_parse.h"
#include "h264data.h"
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index 009a861..c74b9fa 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -111,24 +111,6 @@
#define QP_MAX_NUM (51 + 6*6) // The maximum supported qp
-/* NAL unit types */
-enum {
- NAL_SLICE = 1,
- NAL_DPA = 2,
- NAL_DPB = 3,
- NAL_DPC = 4,
- NAL_IDR_SLICE = 5,
- NAL_SEI = 6,
- NAL_SPS = 7,
- NAL_PPS = 8,
- NAL_AUD = 9,
- NAL_END_SEQUENCE = 10,
- NAL_END_STREAM = 11,
- NAL_FILLER_DATA = 12,
- NAL_SPS_EXT = 13,
- NAL_AUXILIARY_SLICE = 19,
-};
-
/**
* Sequence parameter set
*/
diff --git a/libavcodec/omx.c b/libavcodec/omx.c
index 665ec1d..1b2ae0d 100644
--- a/libavcodec/omx.c
+++ b/libavcodec/omx.c
@@ -41,7 +41,7 @@
#include "libavutil/opt.h"
#include "avcodec.h"
-#include "h264dec.h"
+#include "h264.h"
#include "internal.h"
#ifdef OMX_SKIP64BIT
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index 99b76c0..d576ede 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -25,7 +25,7 @@
#include "libavutil/pixfmt.h"
#include "avcodec.h"
-#include "h264dec.h"
+#include "h264.h"
#include "h264_sei.h"
#include "internal.h"
#include "vaapi_encode.h"
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index f256f67..80318b8 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -48,7 +48,7 @@
#include "libavutil/time_internal.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/dnxhddata.h"
-#include "libavcodec/h264dec.h"
+#include "libavcodec/h264.h"
#include "libavcodec/internal.h"
#include "audiointerleave.h"
#include "avformat.h"
======================================================================
diff --cc libavcodec/h264.h
index 0000000,650371f..72b133b
mode 000000,100644..100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@@ -1,0 -1,45 +1,45 @@@
+ /*
- * This file is part of Libav.
++ * This file is part of FFmpeg.
+ *
- * Libav is free software; you can redistribute it and/or
++ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
- * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
++ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ /**
+ * @file
+ * H.264 common definitions
+ */
+
+ #ifndef AVCODEC_H264_H
+ #define AVCODEC_H264_H
+
+ /* NAL unit types */
+ enum {
+ NAL_SLICE = 1,
+ NAL_DPA = 2,
+ NAL_DPB = 3,
+ NAL_DPC = 4,
+ NAL_IDR_SLICE = 5,
+ NAL_SEI = 6,
+ NAL_SPS = 7,
+ NAL_PPS = 8,
+ NAL_AUD = 9,
+ NAL_END_SEQUENCE = 10,
+ NAL_END_STREAM = 11,
+ NAL_FILLER_DATA = 12,
+ NAL_SPS_EXT = 13,
+ NAL_AUXILIARY_SLICE = 19,
+ };
+
+ #endif /* AVCODEC_H264_H */
diff --cc libavcodec/h264_refs.c
index 4246e87,4172fbd..e66f69a
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@@ -27,9 -27,9 +27,10 @@@
#include <inttypes.h>
+#include "libavutil/avassert.h"
#include "internal.h"
#include "avcodec.h"
+ #include "h264.h"
#include "h264dec.h"
#include "golomb.h"
#include "mpegutils.h"
diff --cc libavcodec/h264dec.h
index 009a861,e79257e..c74b9fa
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@@ -109,26 -106,8 +109,8 @@@
#define IS_REF0(a) ((a) & MB_TYPE_REF0)
#define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT)
-#define QP_MAX_NUM (51 + 2 * 6) // The maximum supported qp
+#define QP_MAX_NUM (51 + 6*6) // The maximum supported qp
- /* NAL unit types */
- enum {
- NAL_SLICE = 1,
- NAL_DPA = 2,
- NAL_DPB = 3,
- NAL_DPC = 4,
- NAL_IDR_SLICE = 5,
- NAL_SEI = 6,
- NAL_SPS = 7,
- NAL_PPS = 8,
- NAL_AUD = 9,
- NAL_END_SEQUENCE = 10,
- NAL_END_STREAM = 11,
- NAL_FILLER_DATA = 12,
- NAL_SPS_EXT = 13,
- NAL_AUXILIARY_SLICE = 19,
- };
-
/**
* Sequence parameter set
*/
diff --cc libavformat/mxfenc.c
index f256f67,1431fc6..80318b8
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@@ -40,25 -34,18 +40,25 @@@
#include <math.h>
#include <time.h>
+#include "libavutil/opt.h"
#include "libavutil/random_seed.h"
+#include "libavutil/timecode.h"
+#include "libavutil/avassert.h"
+#include "libavutil/pixdesc.h"
#include "libavutil/time_internal.h"
#include "libavcodec/bytestream.h"
+#include "libavcodec/dnxhddata.h"
- #include "libavcodec/h264dec.h"
++#include "libavcodec/h264.h"
+#include "libavcodec/internal.h"
#include "audiointerleave.h"
#include "avformat.h"
+#include "avio_internal.h"
#include "internal.h"
#include "mxf.h"
-
-static const int NTSC_samples_per_frame[] = { 1602, 1601, 1602, 1601, 1602, 0 };
-static const int PAL_samples_per_frame[] = { 1920, 0 };
+#include "config.h"
extern AVOutputFormat ff_mxf_d10_muxer;
+extern AVOutputFormat ff_mxf_opatom_muxer;
#define EDIT_UNITS_PER_BODY 250
#define KAG_SIZE 512
More information about the ffmpeg-cvslog
mailing list