[FFmpeg-cvslog] Merge commit '7d7355aa92bb36ca0765c49a569a999bcb96f332'

James Almer git at videolan.org
Tue Jan 31 20:19:57 EET 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Jan 31 15:15:47 2017 -0300| [2eab48177d74782cf948e7ae13aef2ee5d7ab1c1] | committer: James Almer

Merge commit '7d7355aa92bb36ca0765c49a569a999bcb96f332'

* commit '7d7355aa92bb36ca0765c49a569a999bcb96f332':
  x86: Add SSSE3_SLOW CPU flag and related convenience macros

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2eab48177d74782cf948e7ae13aef2ee5d7ab1c1
---

 doc/APIchanges      | 3 +++
 libavutil/cpu.h     | 1 +
 libavutil/version.h | 2 +-
 libavutil/x86/cpu.h | 6 ++++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 109d550..8bca71e 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil:     2015-08-28
 
 API changes, most recent first:
 
+2017-01-31 - xxxxxxx - lavu 55.46.100 / 55.20.0 - cpu.h
+  Add AV_CPU_FLAG_SSSE3SLOW.
+
 2017-01-24 - xxxxxxx - lavu 55.45.100 - channel_layout.h
   Add av_get_extended_channel_layout()
 
diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index 8499f0e..de05593 100644
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -39,6 +39,7 @@
 #define AV_CPU_FLAG_SSE3SLOW 0x20000000 ///< SSE3 supported, but usually not faster
                                         ///< than regular MMX/SSE (e.g. Core1)
 #define AV_CPU_FLAG_SSSE3        0x0080 ///< Conroe SSSE3 functions
+#define AV_CPU_FLAG_SSSE3SLOW 0x4000000 ///< SSSE3 supported, but usually not faster
 #define AV_CPU_FLAG_ATOM     0x10000000 ///< Atom processor, some SSSE3 instructions are slower
 #define AV_CPU_FLAG_SSE4         0x0100 ///< Penryn SSE4.1 functions
 #define AV_CPU_FLAG_SSE42        0x0200 ///< Nehalem SSE4.2 functions
diff --git a/libavutil/version.h b/libavutil/version.h
index 9d95086..8866064 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,7 +79,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  55
-#define LIBAVUTIL_VERSION_MINOR  45
+#define LIBAVUTIL_VERSION_MINOR  46
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff --git a/libavutil/x86/cpu.h b/libavutil/x86/cpu.h
index f171037..309b8e7 100644
--- a/libavutil/x86/cpu.h
+++ b/libavutil/x86/cpu.h
@@ -38,6 +38,8 @@
 #define X86_SSE3_FAST(flags)        CPUEXT_FAST(flags, SSE3)
 #define X86_SSE3_SLOW(flags)        CPUEXT_SLOW(flags, SSE3)
 #define X86_SSSE3(flags)            CPUEXT(flags, SSSE3)
+#define X86_SSSE3_FAST(flags)       CPUEXT_FAST(flags, SSSE3)
+#define X86_SSSE3_SLOW(flags)       CPUEXT_SLOW(flags, SSSE3)
 #define X86_SSE4(flags)             CPUEXT(flags, SSE4)
 #define X86_SSE42(flags)            CPUEXT(flags, SSE42)
 #define X86_AVX(flags)              CPUEXT(flags, AVX)
@@ -61,6 +63,8 @@
 #define EXTERNAL_SSE3_FAST(flags)   CPUEXT_SUFFIX_FAST(flags, _EXTERNAL, SSE3)
 #define EXTERNAL_SSE3_SLOW(flags)   CPUEXT_SUFFIX_SLOW(flags, _EXTERNAL, SSE3)
 #define EXTERNAL_SSSE3(flags)       CPUEXT_SUFFIX(flags, _EXTERNAL, SSSE3)
+#define EXTERNAL_SSSE3_FAST(flags)  CPUEXT_SUFFIX_FAST(flags, _EXTERNAL, SSSE3)
+#define EXTERNAL_SSSE3_SLOW(flags)  CPUEXT_SUFFIX_SLOW(flags, _EXTERNAL, SSSE3)
 #define EXTERNAL_SSE4(flags)        CPUEXT_SUFFIX(flags, _EXTERNAL, SSE4)
 #define EXTERNAL_SSE42(flags)       CPUEXT_SUFFIX(flags, _EXTERNAL, SSE42)
 #define EXTERNAL_AVX(flags)         CPUEXT_SUFFIX(flags, _EXTERNAL, AVX)
@@ -88,6 +92,8 @@
 #define INLINE_SSE3_FAST(flags)     CPUEXT_SUFFIX_FAST(flags, _INLINE, SSE3)
 #define INLINE_SSE3_SLOW(flags)     CPUEXT_SUFFIX_SLOW(flags, _INLINE, SSE3)
 #define INLINE_SSSE3(flags)         CPUEXT_SUFFIX(flags, _INLINE, SSSE3)
+#define INLINE_SSSE3_FAST(flags)    CPUEXT_SUFFIX_FAST(flags, _INLINE, SSSE3)
+#define INLINE_SSSE3_SLOW(flags)    CPUEXT_SUFFIX_SLOW(flags, _INLINE, SSSE3)
 #define INLINE_SSE4(flags)          CPUEXT_SUFFIX(flags, _INLINE, SSE4)
 #define INLINE_SSE42(flags)         CPUEXT_SUFFIX(flags, _INLINE, SSE42)
 #define INLINE_AVX(flags)           CPUEXT_SUFFIX(flags, _INLINE, AVX)


======================================================================

diff --cc doc/APIchanges
index 109d550,1b65c4b..8bca71e
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@@ -15,40 -13,10 +15,43 @@@ libavutil:     2015-08-2
  
  API changes, most recent first:
  
 -2016-07-20 - xxxxxxx - lavu 55.20.0 - cpu.h
++2017-01-31 - xxxxxxx - lavu 55.46.100 / 55.20.0 - cpu.h
+   Add AV_CPU_FLAG_SSSE3SLOW.
+ 
 -2016-07-02 - 4926fa9 - lavu 55.19.0 - hwcontext_vaapi.h
 +2017-01-24 - xxxxxxx - lavu 55.45.100 - channel_layout.h
 +  Add av_get_extended_channel_layout()
 +
 +2017-01-22 - xxxxxxx - lavu 55.44.100 - lfg.h
 +  Add av_lfg_init_from_data().
 +
 +2017-01-xx - xxxxxxx - lavc 57.74.100 - vaapi.h
 +  Deprecate struct vaapi_context and the vaapi.h installed header.
 +  Callers should set AVCodecContext.hw_frames_ctx instead.
 +
 +2017-01-12 - xxxxxxx - lavfi 6.69.100- buffersink.h
 +  Add av_buffersink_get_*() functions.
 +
 +2017-01-06 - xxxxxxx - lavf 57.62.100- avio.h
 +  Add avio_get_dyn_buf()
 +
 +2016-12-10 - xxxxxxx - lavu xx.xx.100- imgutils.h
 +  Add av_image_check_size2()
 +
 +2016-xx-xx - xxxxxxx - lavc 57.67.100 / 57.29.0 - avcodec.h
 +  Add AV_PKT_DATA_SPHERICAL packet side data to export AVSphericalMapping
 +  information from containers.
 +
 +2016-xx-xx - xxxxxxx - lavu 55.42.100 / 55.30.0 - spherical.h
 +  Add AV_FRAME_DATA_SPHERICAL value, av_spherical_alloc() API and
 +  AVSphericalMapping type to export and describe spherical video properties.
 +
 +2016-11-18 - xxxxxxx - lavf 57.58.100 - avformat.h
 +  Add av_stream_add_side_data().
 +
 +2016-xx-xx - xxxxxxx - lavu 55.39.100 - hwcontext_vaapi.h
 +  Add AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE.
 +
 +2016-xx-xx - xxxxxxx - lavu 55.38.100 - hwcontext_vaapi.h
    Add driver quirks field to VAAPI-specific hwdevice and enum with
    members AV_VAAPI_DRIVER_QUIRK_* to represent its values.
  
diff --cc libavutil/version.h
index 9d95086,5cbc0e8..8866064
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@@ -78,9 -53,9 +78,9 @@@
   * @{
   */
  
 -#define LIBAVUTIL_VERSION_MAJOR 55
 -#define LIBAVUTIL_VERSION_MINOR 20
 -#define LIBAVUTIL_VERSION_MICRO  0
 +#define LIBAVUTIL_VERSION_MAJOR  55
- #define LIBAVUTIL_VERSION_MINOR  45
++#define LIBAVUTIL_VERSION_MINOR  46
 +#define LIBAVUTIL_VERSION_MICRO 100
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \



More information about the ffmpeg-cvslog mailing list