github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-19 21:13:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set Android Min API to 21, Fix #48

Browse source
This commit is contained in:
Florian Märkl 2019-10-16 18:14:25 +02:00
commit 80bfc893af
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
3 changed files with 42 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
android/app/build.gradle
View file

@ -8,7 +8,7 @@ android {
buildToolsVersion "29.0.2" buildToolsVersion "29.0.2"
defaultConfig { defaultConfig {
applicationId "com.metallic.chiaki" applicationId "com.metallic.chiaki"
minSdkVersion 26 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"

4
android/app/src/main/cpp/circular-buf.hpp
View file

@ -28,8 +28,8 @@
template<size_t ChunksCount, size_t ChunkSize> template<size_t ChunksCount, size_t ChunkSize>
class CircularBuffer class CircularBuffer
{ {
static_assert(ChunksCount > 0); static_assert(ChunksCount > 0, "ChunksCount > 0");
static_assert(ChunkSize > 0); static_assert(ChunkSize > 0, "ChunkSize > 0");
private: private:
using Queue = memory_relaxed_aquire_release::CircularFifo<uint8_t *, ChunksCount>; using Queue = memory_relaxed_aquire_release::CircularFifo<uint8_t *, ChunksCount>;

52
android/app/src/main/cpp/video-decoder.c
View file

@ -47,11 +47,14 @@ void android_chiaki_video_decoder_fini(AndroidChiakiVideoDecoder *decoder)
{ {
CHIAKI_LOGI(decoder->log, "Video Decoder sending EOS buffer"); CHIAKI_LOGI(decoder->log, "Video Decoder sending EOS buffer");
AMediaCodec_queueInputBuffer(decoder->codec, (size_t)codec_buf_index, 0, 0, decoder->timestamp_cur++, AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM); AMediaCodec_queueInputBuffer(decoder->codec, (size_t)codec_buf_index, 0, 0, decoder->timestamp_cur++, AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM);
chiaki_mutex_unlock(&decoder->codec_mutex);
chiaki_thread_join(&decoder->output_thread, NULL);
} }
else else
{
CHIAKI_LOGE(decoder->log, "Failed to get input buffer for shutting down Video Decoder!"); CHIAKI_LOGE(decoder->log, "Failed to get input buffer for shutting down Video Decoder!");
chiaki_mutex_unlock(&decoder->codec_mutex); chiaki_mutex_unlock(&decoder->codec_mutex);
chiaki_thread_join(&decoder->output_thread, NULL); }
AMediaCodec_delete(decoder->codec); AMediaCodec_delete(decoder->codec);
} }
chiaki_mutex_fini(&decoder->codec_mutex); chiaki_mutex_fini(&decoder->codec_mutex);
@ -63,12 +66,15 @@ void android_chiaki_video_decoder_set_surface(AndroidChiakiVideoDecoder *decoder
if(decoder->codec) if(decoder->codec)
{ {
//CHIAKI_LOGE(decoder->log, "Video Decoder already initialized"); #if __ANDROID_API__ >= 23
CHIAKI_LOGI(decoder->log, "Video decoder already initialized, swapping surface"); CHIAKI_LOGI(decoder->log, "Video decoder already initialized, swapping surface");
ANativeWindow *new_window = surface ? ANativeWindow_fromSurface(env, surface) : NULL; ANativeWindow *new_window = surface ? ANativeWindow_fromSurface(env, surface) : NULL;
AMediaCodec_setOutputSurface(decoder->codec, new_window); AMediaCodec_setOutputSurface(decoder->codec, new_window);
ANativeWindow_release(decoder->window); ANativeWindow_release(decoder->window);
decoder->window = new_window; decoder->window = new_window;
#else
CHIAKI_LOGE(decoder->log, "Video Decoder already initialized");
#endif
goto beach; goto beach;
} }
@ -80,9 +86,7 @@ void android_chiaki_video_decoder_set_surface(AndroidChiakiVideoDecoder *decoder
if(!decoder->codec) if(!decoder->codec)
{ {
CHIAKI_LOGE(decoder->log, "Failed to create AMediaCodec for mime type %s", mime); CHIAKI_LOGE(decoder->log, "Failed to create AMediaCodec for mime type %s", mime);
ANativeWindow_release(decoder->window); goto error_surface;
decoder->window = NULL;
goto beach;
} }
AMediaFormat *format = AMediaFormat_new(); AMediaFormat *format = AMediaFormat_new();
@ -90,21 +94,39 @@ void android_chiaki_video_decoder_set_surface(AndroidChiakiVideoDecoder *decoder
AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_WIDTH, 1280); // TODO: correct values AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_WIDTH, 1280); // TODO: correct values
AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_HEIGHT, 720); AMediaFormat_setInt32(format, AMEDIAFORMAT_KEY_HEIGHT, 720);
AMediaCodec_configure(decoder->codec, format, decoder->window, NULL, 0); // TODO: check result media_status_t r = AMediaCodec_configure(decoder->codec, format, decoder->window, NULL, 0);
AMediaCodec_start(decoder->codec); // TODO: check result if(r != AMEDIA_OK)
{
CHIAKI_LOGE(decoder->log, "AMediaCodec_configure() failed: %d", (int)r);
AMediaFormat_delete(format);
goto error_codec;
}
r = AMediaCodec_start(decoder->codec);
AMediaFormat_delete(format); AMediaFormat_delete(format);
if(r != AMEDIA_OK)
{
CHIAKI_LOGE(decoder->log, "AMediaCodec_start() failed: %d", (int)r);
goto error_codec;
}
ChiakiErrorCode err = chiaki_thread_create(&decoder->output_thread, android_chiaki_video_decoder_output_thread_func, decoder); ChiakiErrorCode err = chiaki_thread_create(&decoder->output_thread, android_chiaki_video_decoder_output_thread_func, decoder);
if(err != CHIAKI_ERR_SUCCESS) if(err != CHIAKI_ERR_SUCCESS)
{ {
CHIAKI_LOGE(decoder->log, "Failed to create output thread for AMediaCodec"); CHIAKI_LOGE(decoder->log, "Failed to create output thread for AMediaCodec");
AMediaCodec_delete(decoder->codec); goto error_codec;
decoder->codec = NULL;
ANativeWindow_release(decoder->window);
decoder->window = NULL;
} }
goto beach;
error_codec:
AMediaCodec_delete(decoder->codec);
decoder->codec = NULL;
error_surface:
ANativeWindow_release(decoder->window);
decoder->window = NULL;
beach: beach:
chiaki_mutex_unlock(&decoder->codec_mutex); chiaki_mutex_unlock(&decoder->codec_mutex);
} }
@ -139,7 +161,11 @@ void android_chiaki_video_decoder_video_sample(uint8_t *buf, size_t buf_size, vo
codec_sample_size = codec_buf_size; codec_sample_size = codec_buf_size;
} }
memcpy(codec_buf, buf, codec_sample_size); memcpy(codec_buf, buf, codec_sample_size);
AMediaCodec_queueInputBuffer(decoder->codec, (size_t)codec_buf_index, 0, codec_sample_size, decoder->timestamp_cur++, 0); // timestamp just raised by 1 for maximum realtime media_status_t r = AMediaCodec_queueInputBuffer(decoder->codec, (size_t)codec_buf_index, 0, codec_sample_size, decoder->timestamp_cur++, 0); // timestamp just raised by 1 for maximum realtime
if(r != AMEDIA_OK)
{
CHIAKI_LOGE(decoder->log, "AMediaCodec_queueInputBuffer() failed: %d", (int)r);
}
buf += codec_sample_size; buf += codec_sample_size;
buf_size -= codec_sample_size; buf_size -= codec_sample_size;