Feature: check if encoder open success or not

Live/src/main/cpp/AudioStream.cpp

@@ -20,13 +20,14 @@ void AudioStream::setAudioCallback(AudioCallback callback) {
     this->audioCallback = callback;
 }
 
-void AudioStream::setAudioEncInfo(int samplesInHZ, int channels) {
+int AudioStream::setAudioEncInfo(int samplesInHZ, int channels) {
     mChannels = channels;
     //open faac encoder
     audioCodec = faacEncOpen(static_cast<unsigned long>(samplesInHZ),
                              static_cast<unsigned int>(channels),
                              &inputSamples,
                              &maxOutputBytes);
+    buffer = new u_char[maxOutputBytes];
 
     //set encoder params
     faacEncConfigurationPtr config = faacEncGetCurrentConfiguration(audioCodec);
@@ -34,10 +35,7 @@ void AudioStream::setAudioEncInfo(int samplesInHZ, int channels) {
     config->aacObjectType = LOW;
     config->inputFormat   = FAAC_INPUT_16BIT;
     config->outputFormat  = 0;
-    faacEncSetConfiguration(audioCodec, config);
+    return faacEncSetConfiguration(audioCodec, config);
-
-    //output buffer
-    buffer = new u_char[maxOutputBytes];
 }
 
 int AudioStream::getInputSamples() const {

Live/src/main/cpp/AudioStream.h

@@ -14,7 +14,7 @@ public:
 
     ~AudioStream();
 
-    void setAudioEncInfo(int samplesInHZ, int channels);
+    int setAudioEncInfo(int samplesInHZ, int channels);
 
     void setAudioCallback(AudioCallback audioCallback);
 

Live/src/main/cpp/PushInterface.h

@@ -7,4 +7,22 @@
 #define LOGI(...) __android_log_print(ANDROID_LOG_INFO,"FrankLive",__VA_ARGS__)
 #define LOGE(...) __android_log_print(ANDROID_LOG_ERROR,"FrankLive",__VA_ARGS__)
 
+/***************relative to Java**************/
+//error code for opening video encoder
+const int ERROR_VIDEO_ENCODER_OPEN = 0x01;
+//error code for video encoding
+const int ERROR_VIDEO_ENCODE = 0x02;
+//error code for opening audio encoder
+const int ERROR_AUDIO_ENCODER_OPEN = 0x03;
+//error code for audio encoding
+const int ERROR_AUDIO_ENCODE = 0x04;
+//error code for RTMP connecting
+const int ERROR_RTMP_CONNECT = 0x05;
+//error code for connecting stream
+const int ERROR_RTMP_CONNECT_STREAM = 0x06;
+//error code for sending packet
+const int ERROR_RTMP_SEND_PACKET = 0x07;
+
+/***************relative to Java**************/
+
 #endif

Live/src/main/cpp/RtmpPusher.cpp

@@ -22,24 +22,6 @@ JavaVM *javaVM;
 //callback object
 jobject jobject_error;
 
-/***************relative to Java**************/
-//error code for opening video encoder
-const int ERROR_VIDEO_ENCODER_OPEN = 0x01;
-//error code for video encoding
-const int ERROR_VIDEO_ENCODE = 0x02;
-//error code for opening audio encoder
-const int ERROR_AUDIO_ENCODER_OPEN = 0x03;
-//error code for audio encoding
-const int ERROR_AUDIO_ENCODE = 0x04;
-//error code for RTMP connecting
-const int ERROR_RTMP_CONNECT = 0x05;
-//error code for connecting stream
-const int ERROR_RTMP_CONNECT_STREAM = 0x06;
-//error code for sending packet
-const int ERROR_RTMP_SEND_PACKET = 0x07;
-
-/***************relative to Java**************/
-
 //when calling System.loadLibrary, will callback it
 jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
     javaVM = vm;
@@ -152,7 +134,10 @@ RTMP_PUSHER_FUNC(void, native_1init) {
 RTMP_PUSHER_FUNC(void, native_1setVideoCodecInfo,
                  jint width, jint height, jint fps, jint bitrate) {
     if (videoStream) {
-        videoStream->setVideoEncInfo(width, height, fps, bitrate);
+        int ret = videoStream->setVideoEncInfo(width, height, fps, bitrate);
+        if (ret < 0) {
+            throwErrToJava(ERROR_VIDEO_ENCODER_OPEN);
+        }
     }
 }
 
@@ -181,7 +166,10 @@ RTMP_PUSHER_FUNC(void, native_1pushVideo, jbyteArray yuv, jint camera_type) {
 
 RTMP_PUSHER_FUNC(void, native_1setAudioCodecInfo, jint sampleRateInHz, jint channels) {
     if (audioStream) {
-        audioStream->setAudioEncInfo(sampleRateInHz, channels);
+        int ret = audioStream->setAudioEncInfo(sampleRateInHz, channels);
+        if (ret < 0) {
+            throwErrToJava(ERROR_AUDIO_ENCODER_OPEN);
+        }
     }
 }
 

Live/src/main/cpp/VideoStream.cpp

@@ -23,7 +23,7 @@ VideoStream::~VideoStream() {
     }
 }
 
-void VideoStream::setVideoEncInfo(int width, int height, int fps, int bitrate) {
+int VideoStream::setVideoEncInfo(int width, int height, int fps, int bitrate) {
     pthread_mutex_lock(&mutex);
     m_frameLen = width * height;
     if (videoCodec) {
@@ -38,7 +38,10 @@ void VideoStream::setVideoEncInfo(int width, int height, int fps, int bitrate) {
 
     //setting x264 params
     x264_param_t param;
-    x264_param_default_preset(&param, "ultrafast", "zerolatency");
+    int ret = x264_param_default_preset(&param, "ultrafast", "zerolatency");
+    if (ret < 0) {
+        goto end;
+    }
     param.i_level_idc = 32;
     //input format
     param.i_csp = X264_CSP_I420;
@@ -69,12 +72,21 @@ void VideoStream::setVideoEncInfo(int width, int height, int fps, int bitrate) {
     //thread number
     param.i_threads = 1;
 
-    x264_param_apply_profile(&param, "baseline");
+    ret = x264_param_apply_profile(&param, "baseline");
+    if (ret < 0) {
+        goto end;
+    }
     //open encoder
     videoCodec = x264_encoder_open(&param);
+    if (!videoCodec) {
+        ret = -1;
+        goto end;
+    }
     pic_in = new x264_picture_t();
     x264_picture_alloc(pic_in, X264_CSP_I420, width, height);
+end:
     pthread_mutex_unlock(&mutex);
+    return ret;
 }
 
 void VideoStream::setVideoCallback(VideoCallback callback) {

Live/src/main/cpp/VideoStream.h

@@ -15,7 +15,7 @@ public:
 
     ~VideoStream();
 
-    void setVideoEncInfo(int width, int height, int fps, int bitrate);
+    int setVideoEncInfo(int width, int height, int fps, int bitrate);
 
     void encodeVideo(int8_t *data, int camera_type);