[vlc-commits] avcodec: add aac-profile strings for he-aac and he-aac v2, libfdk-aac supports them

[Ilkka Ollakka]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Tue Aug 14 16:21:45 2012 +0300| [cae1bbba8bf4eb1a5de4c1bbb06904018e9980fc] | committer: Ilkka Ollakka

avcodec: add aac-profile strings for he-aac and he-aac v2, libfdk-aac supports them

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cae1bbba8bf4eb1a5de4c1bbb06904018e9980fc
---

 modules/codec/avcodec/encoder.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index 9a4db76..ae1de3b 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -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" );