Skip to content

V
vlc
Commit d6d6f301 authored by Thomas Guillem's avatar Thomas Guillem
Browse files
Options

mediacodec: Open/Close: separate JNI part from Decoder part 

Rename OpenMediaCodec to StartMediaCodec and CloseMediaCodec to StopMediaCodec.
parent 5a79bd41
Show whitespace changes
Inline Side-by-side
Showing with 173 additions and 161 deletions
modules/codec/omxil/mediacodec.c
View file @ d6d6f301
...@@ -150,6 +150,7 @@ struct decoder_sys_t ...@@ -150,6 +150,7 @@ struct decoder_sys_t
jobject input_buffers, output_buffers; jobject input_buffers, output_buffers;
int pixel_format; int pixel_format;
int stride, slice_height; int stride, slice_height;
const char *mime;
char *name; char *name;
/* Codec Specific Data buffer: sent in PutInput after a start or a flush /* Codec Specific Data buffer: sent in PutInput after a start or a flush
...@@ -278,7 +279,7 @@ static const struct member members[] = { ...@@ -278,7 +279,7 @@ static const struct member members[] = {
*****************************************************************************/ *****************************************************************************/
static int OpenDecoder(vlc_object_t *); static int OpenDecoder(vlc_object_t *);
static void CloseDecoder(vlc_object_t *); static void CloseDecoder(vlc_object_t *);
static void CloseMediaCodec(decoder_t *p_dec, JNIEnv *env); static void JniStopMediaCodec(decoder_t *p_dec, JNIEnv *env);
static picture_t *DecodeVideo(decoder_t *, block_t **); static picture_t *DecodeVideo(decoder_t *, block_t **);
...@@ -538,16 +539,13 @@ static int H264SetCSD(decoder_t *p_dec, void *p_buf, size_t i_size, ...@@ -538,16 +539,13 @@ static int H264SetCSD(decoder_t *p_dec, void *p_buf, size_t i_size,
} }
static jstring GetMediaCodecName(decoder_t *p_dec, JNIEnv *env, static jstring GetMediaCodecName(decoder_t *p_dec, JNIEnv *env,
const char *mime, jstring jmime) const char *mime, jstring jmime,
size_t h264_profile)
{ {
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
int num_codecs; int num_codecs;
size_t fmt_profile = 0;
jstring jcodec_name = NULL; jstring jcodec_name = NULL;
if (p_dec->fmt_in.i_codec == VLC_CODEC_H264)
h264_get_profile_level(&p_dec->fmt_in, &fmt_profile, NULL, NULL);
num_codecs = (*env)->CallStaticIntMethod(env, num_codecs = (*env)->CallStaticIntMethod(env,
jfields.media_codec_list_class, jfields.media_codec_list_class,
jfields.get_codec_count); jfields.get_codec_count);
...@@ -600,7 +598,7 @@ static jstring GetMediaCodecName(decoder_t *p_dec, JNIEnv *env, ...@@ -600,7 +598,7 @@ static jstring GetMediaCodecName(decoder_t *p_dec, JNIEnv *env,
/* The mime type is matching for this component. We /* The mime type is matching for this component. We
now check if the capabilities of the codec is now check if the capabilities of the codec is
matching the video format. */ matching the video format. */
if (p_dec->fmt_in.i_codec == VLC_CODEC_H264 && fmt_profile) { if (h264_profile) {
/* This decoder doesn't expose its profiles and is high /* This decoder doesn't expose its profiles and is high
* profile capable */ * profile capable */
if (!strncmp(name_ptr, "OMX.LUMEVideoDecoder", __MIN(20, name_len))) if (!strncmp(name_ptr, "OMX.LUMEVideoDecoder", __MIN(20, name_len)))
...@@ -612,7 +610,7 @@ static jstring GetMediaCodecName(decoder_t *p_dec, JNIEnv *env, ...@@ -612,7 +610,7 @@ static jstring GetMediaCodecName(decoder_t *p_dec, JNIEnv *env,
int omx_profile = (*env)->GetIntField(env, profile_level, jfields.profile_field); int omx_profile = (*env)->GetIntField(env, profile_level, jfields.profile_field);
size_t codec_profile = convert_omx_to_profile_idc(omx_profile); size_t codec_profile = convert_omx_to_profile_idc(omx_profile);
(*env)->DeleteLocalRef(env, profile_level); (*env)->DeleteLocalRef(env, profile_level);
if (codec_profile != fmt_profile) if (codec_profile != h264_profile)
continue; continue;
/* Some encoders set the level too high, thus we ignore it for the moment. /* Some encoders set the level too high, thus we ignore it for the moment.
We could try to guess the actual profile based on the resolution. */ We could try to guess the actual profile based on the resolution. */
...@@ -652,13 +650,11 @@ loopclean: ...@@ -652,13 +650,11 @@ loopclean:
return jcodec_name; return jcodec_name;
} }
/***************************************************************************** static int JniStartMediaCodec(decoder_t *p_dec, JNIEnv *env, jobject jsurface,
* OpenMediaCodec: Create the mediacodec instance const char *mime, int i_width, int i_height,
*****************************************************************************/ size_t h264_profile, int i_angle)
static int OpenMediaCodec(decoder_t *p_dec, JNIEnv *env)
{ {
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
const char *mime = NULL;
int i_ret = VLC_EGENERIC; int i_ret = VLC_EGENERIC;
jstring jmime = NULL; jstring jmime = NULL;
jstring jcodec_name = NULL; jstring jcodec_name = NULL;
...@@ -669,24 +665,11 @@ static int OpenMediaCodec(decoder_t *p_dec, JNIEnv *env) ...@@ -669,24 +665,11 @@ static int OpenMediaCodec(decoder_t *p_dec, JNIEnv *env)
jobject joutput_buffers = NULL; jobject joutput_buffers = NULL;
jobject jbuffer_info = NULL; jobject jbuffer_info = NULL;
switch (p_dec->fmt_in.i_codec) {
case VLC_CODEC_HEVC: mime = "video/hevc"; break;
case VLC_CODEC_H264: mime = "video/avc"; break;
case VLC_CODEC_H263: mime = "video/3gpp"; break;
case VLC_CODEC_MP4V: mime = "video/mp4v-es"; break;
case VLC_CODEC_WMV3: mime = "video/x-ms-wmv"; break;
case VLC_CODEC_VC1: mime = "video/wvc1"; break;
case VLC_CODEC_VP8: mime = "video/x-vnd.on2.vp8"; break;
case VLC_CODEC_VP9: mime = "video/x-vnd.on2.vp9"; break;
default:
vlc_assert_unreachable();
}
jmime = (*env)->NewStringUTF(env, mime); jmime = (*env)->NewStringUTF(env, mime);
if (!jmime) if (!jmime)
return VLC_EGENERIC; return VLC_EGENERIC;
jcodec_name = GetMediaCodecName(p_dec, env, mime, jmime); jcodec_name = GetMediaCodecName(p_dec, env, mime, jmime, h264_profile);
if (!jcodec_name) { if (!jcodec_name) {
msg_Dbg(p_dec, "No suitable codec matching %s was found", mime); msg_Dbg(p_dec, "No suitable codec matching %s was found", mime);
goto error; goto error;
...@@ -705,122 +688,36 @@ static int OpenMediaCodec(decoder_t *p_dec, JNIEnv *env) ...@@ -705,122 +688,36 @@ static int OpenMediaCodec(decoder_t *p_dec, JNIEnv *env)
p_sys->allocated = true; p_sys->allocated = true;
p_sys->codec = (*env)->NewGlobalRef(env, jcodec); p_sys->codec = (*env)->NewGlobalRef(env, jcodec);
/* Either we use a "csd-0" buffer that is provided before codec
* initialisation via the MediaFormat class, or use a CODEC_CONFIG buffer
* that can be provided during playback (and must be provided after a flush
* and a start). */
if (p_dec->fmt_in.i_extra && !p_sys->p_csd)
{
if (p_dec->fmt_in.i_codec == VLC_CODEC_H264
|| p_dec->fmt_in.i_codec == VLC_CODEC_HEVC)
{
int buf_size = p_dec->fmt_in.i_extra + 20;
uint32_t size = p_dec->fmt_in.i_extra;
void *p_buf = malloc(buf_size);
if (!p_buf)
{
msg_Warn(p_dec, "extra buffer allocation failed");
goto error;
}
if (p_dec->fmt_in.i_codec == VLC_CODEC_H264)
{
if (((uint8_t*)p_dec->fmt_in.p_extra)[0] == 1
&& convert_sps_pps(p_dec, p_dec->fmt_in.p_extra,
p_dec->fmt_in.i_extra,
p_buf, buf_size, &size,
&p_sys->nal_size) == VLC_SUCCESS)
H264SetCSD(p_dec, p_buf, size, NULL);
} else
{
if (convert_hevc_nal_units(p_dec, p_dec->fmt_in.p_extra,
p_dec->fmt_in.i_extra,
p_buf, buf_size, &size,
&p_sys->nal_size) == VLC_SUCCESS)
{
struct csd csd;
csd.p_buf = p_buf;
csd.i_size = size;
CSDDup(p_dec, &csd, 1);
}
}
free(p_buf);
}
if (!p_sys->p_csd)
{
struct csd csd;
csd.p_buf = p_dec->fmt_in.p_extra;
csd.i_size = p_dec->fmt_in.i_extra;
CSDDup(p_dec, &csd, 1);
}
p_sys->i_csd_send = 0;
}
if (!p_sys->i_width && !p_sys->i_height)
{
msg_Err(p_dec, "invalid size, abort MediaCodec");
goto error;
}
jformat = (*env)->CallStaticObjectMethod(env, jfields.media_format_class, jformat = (*env)->CallStaticObjectMethod(env, jfields.media_format_class,
jfields.create_video_format, jmime, jfields.create_video_format, jmime,
p_sys->i_width, p_sys->i_height); i_width, i_height);
p_sys->direct_rendering = var_InheritBool(p_dec, CFG_PREFIX "dr"); p_sys->direct_rendering = !!jsurface;
/* There is no way to rotate the video using direct rendering (and using a /* There is no way to rotate the video using direct rendering (and using a
* SurfaceView) before API 21 (Lollipop). Therefore, we deactivate direct * SurfaceView) before API 21 (Lollipop). Therefore, we deactivate direct
* rendering if video doesn't have a normal rotation and if * rendering if video doesn't have a normal rotation and if
* get_input_buffer method is not present (This method exists since API * get_input_buffer method is not present (This method exists since API
* 21). */ * 21). */
if (p_sys->direct_rendering if (p_sys->direct_rendering && i_angle != 0 && !jfields.get_input_buffer)
&& p_dec->fmt_in.video.orientation != ORIENT_NORMAL
&& !jfields.get_input_buffer)
p_sys->direct_rendering = false; p_sys->direct_rendering = false;
if (p_sys->direct_rendering) { if (p_sys->direct_rendering) {
if (p_dec->fmt_in.video.orientation != ORIENT_NORMAL) { if (i_angle != 0)
int i_angle; {
switch (p_dec->fmt_in.video.orientation) {
case ORIENT_ROTATED_90:
i_angle = 90;
break;
case ORIENT_ROTATED_180:
i_angle = 180;
break;
case ORIENT_ROTATED_270:
i_angle = 270;
break;
default:
i_angle = 0;
}
jrotation_string = (*env)->NewStringUTF(env, "rotation-degrees"); jrotation_string = (*env)->NewStringUTF(env, "rotation-degrees");
(*env)->CallVoidMethod(env, jformat, jfields.set_integer, (*env)->CallVoidMethod(env, jformat, jfields.set_integer,
jrotation_string, i_angle); jrotation_string, i_angle);
} }
jobject surf = jni_LockAndGetAndroidJavaSurface();
if (surf) {
// Configure MediaCodec with the Android surface. // Configure MediaCodec with the Android surface.
(*env)->CallVoidMethod(env, p_sys->codec, jfields.configure, (*env)->CallVoidMethod(env, p_sys->codec, jfields.configure,
jformat, surf, NULL, 0); jformat, jsurface, NULL, 0);
if (CHECK_EXCEPTION()) { if (CHECK_EXCEPTION()) {
msg_Warn(p_dec, "Exception occurred in MediaCodec.configure with an output surface."); msg_Warn(p_dec, "Exception occurred in MediaCodec.configure with an output surface.");
jni_UnlockAndroidSurface();
goto error; goto error;
} }
p_dec->fmt_out.i_codec = VLC_CODEC_ANDROID_OPAQUE;
jni_UnlockAndroidSurface();
} else { } else {
msg_Warn(p_dec, "Failed to get the Android Surface, disabling direct rendering.");
p_sys->direct_rendering = false;
}
}
if (!p_sys->direct_rendering) {
(*env)->CallVoidMethod(env, p_sys->codec, jfields.configure, (*env)->CallVoidMethod(env, p_sys->codec, jfields.configure,
jformat, NULL, NULL, 0); jformat, NULL, NULL, 0);
if (CHECK_EXCEPTION()) { if (CHECK_EXCEPTION()) {
...@@ -857,7 +754,6 @@ static int OpenMediaCodec(decoder_t *p_dec, JNIEnv *env) ...@@ -857,7 +754,6 @@ static int OpenMediaCodec(decoder_t *p_dec, JNIEnv *env)
jbuffer_info = (*env)->NewObject(env, jfields.buffer_info_class, jbuffer_info = (*env)->NewObject(env, jfields.buffer_info_class,
jfields.buffer_info_ctor); jfields.buffer_info_ctor);
p_sys->buffer_info = (*env)->NewGlobalRef(env, jbuffer_info); p_sys->buffer_info = (*env)->NewGlobalRef(env, jbuffer_info);
p_sys->b_update_format = true;
i_ret = VLC_SUCCESS; i_ret = VLC_SUCCESS;
...@@ -880,30 +776,119 @@ error: ...@@ -880,30 +776,119 @@ error:
(*env)->DeleteLocalRef(env, jbuffer_info); (*env)->DeleteLocalRef(env, jbuffer_info);
if (i_ret != VLC_SUCCESS) if (i_ret != VLC_SUCCESS)
CloseMediaCodec(p_dec, env); JniStopMediaCodec(p_dec, env);
return i_ret; return i_ret;
} }
/***************************************************************************** /*****************************************************************************
* CloseMediaCodec: Close the mediacodec instance * StartMediaCodec: Create the mediacodec instance
*****************************************************************************/ *****************************************************************************/
static void CloseMediaCodec(decoder_t *p_dec, JNIEnv *env) static int StartMediaCodec(decoder_t *p_dec, JNIEnv *env)
{ {
decoder_sys_t *p_sys = p_dec->p_sys; decoder_sys_t *p_sys = p_dec->p_sys;
int i_angle = 0, i_ret;
size_t h264_profile = 0;
jobject jsurface = NULL;
if (!p_sys) if (p_dec->fmt_in.i_extra && !p_sys->p_csd)
return; {
if (p_dec->fmt_in.i_codec == VLC_CODEC_H264
|| p_dec->fmt_in.i_codec == VLC_CODEC_HEVC)
{
int buf_size = p_dec->fmt_in.i_extra + 20;
uint32_t size = p_dec->fmt_in.i_extra;
void *p_buf = malloc(buf_size);
free(p_sys->name); if (!p_buf)
p_sys->name = NULL; {
msg_Warn(p_dec, "extra buffer allocation failed");
return VLC_EGENERIC;
}
/* Invalidate all pictures that are currently in flight in order if (p_dec->fmt_in.i_codec == VLC_CODEC_H264)
* to prevent the vout from using destroyed output buffers. */ {
if (p_sys->direct_rendering) { if (((uint8_t*)p_dec->fmt_in.p_extra)[0] == 1
InvalidateAllPictures(p_dec); && convert_sps_pps(p_dec, p_dec->fmt_in.p_extra,
p_sys->direct_rendering = false; p_dec->fmt_in.i_extra,
p_buf, buf_size, &size,
&p_sys->nal_size) == VLC_SUCCESS)
H264SetCSD(p_dec, p_buf, size, NULL);
} else
{
if (convert_hevc_nal_units(p_dec, p_dec->fmt_in.p_extra,
p_dec->fmt_in.i_extra,
p_buf, buf_size, &size,
&p_sys->nal_size) == VLC_SUCCESS)
{
struct csd csd;
csd.p_buf = p_buf;
csd.i_size = size;
CSDDup(p_dec, &csd, 1);
}
}
free(p_buf);
}
if (!p_sys->p_csd)
{
struct csd csd;
csd.p_buf = p_dec->fmt_in.p_extra;
csd.i_size = p_dec->fmt_in.i_extra;
CSDDup(p_dec, &csd, 1);
}
p_sys->i_csd_send = 0;
}
if (!p_sys->i_width || !p_sys->i_height)
{
msg_Err(p_dec, "invalid size, abort MediaCodec");
return VLC_EGENERIC;
} }
if ( p_dec->fmt_in.video.orientation != ORIENT_NORMAL)
{
switch (p_dec->fmt_in.video.orientation)
{
case ORIENT_ROTATED_90:
i_angle = 90;
break;
case ORIENT_ROTATED_180:
i_angle = 180;
break;
case ORIENT_ROTATED_270:
i_angle = 270;
break;
default:
i_angle = 0;
}
}
if (p_dec->fmt_in.i_codec == VLC_CODEC_H264)
h264_get_profile_level(&p_dec->fmt_in, &h264_profile, NULL, NULL);
if (var_InheritBool(p_dec, CFG_PREFIX "dr"))
jsurface = jni_LockAndGetAndroidJavaSurface();
i_ret = JniStartMediaCodec(p_dec, env, jsurface, p_sys->mime,
p_sys->i_width, p_sys->i_height, h264_profile,
i_angle);
if (jsurface)
jni_UnlockAndroidSurface();
if (i_ret == VLC_SUCCESS)
{
if (p_sys->direct_rendering)
p_dec->fmt_out.i_codec = VLC_CODEC_ANDROID_OPAQUE;
p_sys->b_update_format = true;
return VLC_SUCCESS;
} else
return VLC_EGENERIC;
}
static void JniStopMediaCodec(decoder_t *p_dec, JNIEnv *env)
{
decoder_sys_t *p_sys = p_dec->p_sys;
if (p_sys->input_buffers) { if (p_sys->input_buffers) {
(*env)->DeleteGlobalRef(env, p_sys->input_buffers); (*env)->DeleteGlobalRef(env, p_sys->input_buffers);
p_sys->input_buffers = NULL; p_sys->input_buffers = NULL;
...@@ -936,6 +921,26 @@ static void CloseMediaCodec(decoder_t *p_dec, JNIEnv *env) ...@@ -936,6 +921,26 @@ static void CloseMediaCodec(decoder_t *p_dec, JNIEnv *env)
} }
} }
/*****************************************************************************
* StopMediaCodec: Close the mediacodec instance
*****************************************************************************/
static void StopMediaCodec(decoder_t *p_dec, JNIEnv *env)
{
decoder_sys_t *p_sys = p_dec->p_sys;
free(p_sys->name);
p_sys->name = NULL;
/* Invalidate all pictures that are currently in flight in order
* to prevent the vout from using destroyed output buffers. */
if (p_sys->direct_rendering) {
InvalidateAllPictures(p_dec);
p_sys->direct_rendering = false;
}
JniStopMediaCodec(p_dec, env);
}
/***************************************************************************** /*****************************************************************************
* OpenDecoder: Create the decoder instance * OpenDecoder: Create the decoder instance
*****************************************************************************/ *****************************************************************************/
...@@ -943,29 +948,36 @@ static int OpenDecoder(vlc_object_t *p_this) ...@@ -943,29 +948,36 @@ static int OpenDecoder(vlc_object_t *p_this)
{ {
decoder_t *p_dec = (decoder_t*)p_this; decoder_t *p_dec = (decoder_t*)p_this;
JNIEnv* env = NULL; JNIEnv* env = NULL;
const char *mime;
if (p_dec->fmt_in.i_cat != VIDEO_ES && !p_dec->b_force) if (p_dec->fmt_in.i_cat != VIDEO_ES && !p_dec->b_force)
return VLC_EGENERIC; return VLC_EGENERIC;
switch (p_dec->fmt_in.i_codec) { switch (p_dec->fmt_in.i_codec) {
case VLC_CODEC_H264: case VLC_CODEC_HEVC: mime = "video/hevc"; break;
/* We can handle h264 without a valid video size */ case VLC_CODEC_H264: mime = "video/avc"; break;
break; case VLC_CODEC_H263: mime = "video/3gpp"; break;
case VLC_CODEC_HEVC: case VLC_CODEC_MP4V: mime = "video/mp4v-es"; break;
case VLC_CODEC_H263: case VLC_CODEC_WMV3: mime = "video/x-ms-wmv"; break;
case VLC_CODEC_MP4V: case VLC_CODEC_VC1: mime = "video/wvc1"; break;
case VLC_CODEC_WMV3: case VLC_CODEC_VP8: mime = "video/x-vnd.on2.vp8"; break;
case VLC_CODEC_VC1: case VLC_CODEC_VP9: mime = "video/x-vnd.on2.vp9"; break;
case VLC_CODEC_VP8:
case VLC_CODEC_VP9:
if (p_dec->fmt_in.video.i_width && p_dec->fmt_in.video.i_height)
break;
default: default:
msg_Dbg(p_dec, "codec %4.4s or resolution (%dx%d) not supported", msg_Dbg(p_dec, "codec %4.4s not supported",
(char *)&p_dec->fmt_in.i_codec, (char *)&p_dec->fmt_in.i_codec);
return VLC_EGENERIC;
}
if (!p_dec->fmt_in.video.i_width || !p_dec->fmt_in.video.i_height)
{
/* We can handle h264 without a valid video size */
if (p_dec->fmt_in.i_codec != VLC_CODEC_H264)
{
msg_Dbg(p_dec, "resolution (%dx%d) not supported",
p_dec->fmt_in.video.i_width, p_dec->fmt_in.video.i_height); p_dec->fmt_in.video.i_width, p_dec->fmt_in.video.i_height);
return VLC_EGENERIC; return VLC_EGENERIC;
} }
}
if (!(env = jni_get_env(THREAD_NAME))) if (!(env = jni_get_env(THREAD_NAME)))
goto error; goto error;
...@@ -991,6 +1003,7 @@ static int OpenDecoder(vlc_object_t *p_this) ...@@ -991,6 +1003,7 @@ static int OpenDecoder(vlc_object_t *p_this)
if (!p_dec->p_sys->timestamp_fifo) if (!p_dec->p_sys->timestamp_fifo)
goto error; goto error;
p_dec->p_sys->mime = mime;
p_dec->p_sys->b_new_block = true; p_dec->p_sys->b_new_block = true;
switch (p_dec->fmt_in.i_codec) switch (p_dec->fmt_in.i_codec)
...@@ -1011,7 +1024,7 @@ static int OpenDecoder(vlc_object_t *p_this) ...@@ -1011,7 +1024,7 @@ static int OpenDecoder(vlc_object_t *p_this)
} }
break; break;
} }
return OpenMediaCodec(p_dec, env); return StartMediaCodec(p_dec, env);
error: error:
CloseDecoder(p_this); CloseDecoder(p_this);
...@@ -1031,12 +1044,11 @@ static void CloseDecoder(vlc_object_t *p_this) ...@@ -1031,12 +1044,11 @@ static void CloseDecoder(vlc_object_t *p_this)
return; return;
if ((env = jni_get_env(THREAD_NAME))) if ((env = jni_get_env(THREAD_NAME)))
CloseMediaCodec(p_dec, env); StopMediaCodec(p_dec, env);
else else
msg_Warn(p_dec, "Can't get a JNIEnv, can't close mediacodec !"); msg_Warn(p_dec, "Can't get a JNIEnv, can't close mediacodec !");
CSDFree(p_dec); CSDFree(p_dec);
free(p_sys->name);
ArchitectureSpecificCopyHooksDestroy(p_sys->pixel_format, &p_sys->architecture_specific_data); ArchitectureSpecificCopyHooksDestroy(p_sys->pixel_format, &p_sys->architecture_specific_data);
free(p_sys->pp_inflight_pictures); free(p_sys->pp_inflight_pictures);
if (p_sys->timestamp_fifo) if (p_sys->timestamp_fifo)
...@@ -1422,7 +1434,7 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block) ...@@ -1422,7 +1434,7 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block)
int i_output_ret = 0; int i_output_ret = 0;
int i_input_ret = 0; int i_input_ret = 0;
bool b_error = false; bool b_error = false;
bool b_delayed_open = false; bool b_delayed_start = false;
bool b_new_block = p_block ? p_sys->b_new_block : false; bool b_new_block = p_block ? p_sys->b_new_block : false;
if (p_sys->error_state) if (p_sys->error_state)
...@@ -1464,7 +1476,7 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block) ...@@ -1464,7 +1476,7 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block)
{ {
msg_Err(p_dec, "SPS/PPS changed during playback and " msg_Err(p_dec, "SPS/PPS changed during playback and "
"video size are different. Restart it !"); "video size are different. Restart it !");
CloseMediaCodec(p_dec, env); StopMediaCodec(p_dec, env);
} else } else
{ {
msg_Err(p_dec, "SPS/PPS changed during playback. Flush it"); msg_Err(p_dec, "SPS/PPS changed during playback. Flush it");
...@@ -1473,7 +1485,7 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block) ...@@ -1473,7 +1485,7 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block)
} }
} }
if (!p_sys->codec) if (!p_sys->codec)
b_delayed_open = true; b_delayed_start = true;
} }
/* try delayed opening if there is a new extra data */ /* try delayed opening if there is a new extra data */
...@@ -1483,11 +1495,11 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block) ...@@ -1483,11 +1495,11 @@ static picture_t *DecodeVideo(decoder_t *p_dec, block_t **pp_block)
{ {
case VLC_CODEC_VC1: case VLC_CODEC_VC1:
if (p_dec->fmt_in.i_extra) if (p_dec->fmt_in.i_extra)
b_delayed_open = true; b_delayed_start = true;
default: default:
break; break;
} }
if (b_delayed_open && OpenMediaCodec(p_dec, env) != VLC_SUCCESS) if (b_delayed_start && StartMediaCodec(p_dec, env) != VLC_SUCCESS)
{ {
b_error = true; b_error = true;
goto endclean; goto endclean;
......
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