]> git.sesse.net Git - vlc/commitdiff
avcodec: add aac-profile strings for he-aac and he-aac v2, libfdk-aac supports them
authorIlkka Ollakka <ileoo@videolan.org>
Tue, 14 Aug 2012 13:21:45 +0000 (16:21 +0300)
committerIlkka Ollakka <ileoo@videolan.org>
Tue, 14 Aug 2012 13:24:43 +0000 (16:24 +0300)
modules/codec/avcodec/encoder.c

index 9a4db76f890348aed17b985e8865ff85a613be56..ae1de3b190d2a90a343ffc301b4f8373bed26b43 100644 (file)
@@ -391,8 +391,15 @@ int OpenEncoder( vlc_object_t *p_this )
         else if( !strncmp( psz_val, "ssr", 3 ) )
             p_sys->i_aac_profile = FF_PROFILE_AAC_SSR;
 #endif
-        else  if( !strncmp( psz_val, "ltp", 3 ) )
+        else if( !strncmp( psz_val, "ltp", 3 ) )
             p_sys->i_aac_profile = FF_PROFILE_AAC_LTP;
+#if LIBAVCODEC_VERSION_CHECK( 54, 19, 0, 35, 100 )
+/* These require ffmpeg with libfdk-aac */
+        else if( !strncmp( psz_val, "hev2", 4 ) )
+            p_sys->i_aac_profile = FF_PROFILE_AAC_HE_V2;
+        else if( !strncmp( psz_val, "hev1", 4 ) )
+            p_sys->i_aac_profile = FF_PROFILE_AAC_HE;
+#endif
         else
         {
             msg_Warn( p_enc, "unknown AAC profile requested, setting it to low" );