Commit 3c1cf08e authored by Thomas Guillem's avatar Thomas Guillem

mediacodec_ndk: set a config flag for config buffers

parent 21c71b17
...@@ -42,6 +42,10 @@ ...@@ -42,6 +42,10 @@
#define THREAD_NAME "mediacodec_ndk" #define THREAD_NAME "mediacodec_ndk"
extern JNIEnv *jni_get_env(const char *name); extern JNIEnv *jni_get_env(const char *name);
/* Not in NdkMedia API but we need it since we send config data via input
* buffers and not via "csd-*" buffers from AMediaFormat */
#define AMEDIACODEC_FLAG_CODEC_CONFIG 2
/***************************************************************************** /*****************************************************************************
* NdkMediaError.h * NdkMediaError.h
*****************************************************************************/ *****************************************************************************/
...@@ -392,7 +396,7 @@ static int PutInput(mc_api *api, const void *p_buf, size_t i_size, ...@@ -392,7 +396,7 @@ static int PutInput(mc_api *api, const void *p_buf, size_t i_size,
ssize_t i_index; ssize_t i_index;
uint8_t *p_mc_buf; uint8_t *p_mc_buf;
size_t i_mc_size; size_t i_mc_size;
(void) b_config; int i_flags = b_config ? AMEDIACODEC_FLAG_CODEC_CONFIG : 0;
i_index = syms.AMediaCodec.dequeueInputBuffer(p_sys->p_codec, i_timeout); i_index = syms.AMediaCodec.dequeueInputBuffer(p_sys->p_codec, i_timeout);
if (i_index < 0) if (i_index < 0)
...@@ -416,7 +420,7 @@ static int PutInput(mc_api *api, const void *p_buf, size_t i_size, ...@@ -416,7 +420,7 @@ static int PutInput(mc_api *api, const void *p_buf, size_t i_size,
memcpy(p_mc_buf, p_buf, i_mc_size); memcpy(p_mc_buf, p_buf, i_mc_size);
if (syms.AMediaCodec.queueInputBuffer(p_sys->p_codec, i_index, 0, i_mc_size, if (syms.AMediaCodec.queueInputBuffer(p_sys->p_codec, i_index, 0, i_mc_size,
i_ts, 0) == AMEDIA_OK) i_ts, i_flags) == AMEDIA_OK)
return 1; return 1;
else else
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment