remove uvSize

Live/src/main/cpp/VideoStream.cpp

@@ -26,8 +26,7 @@ void VideoStream::setVideoEncInfo(int width, int height, int fps, int bitrate) {
     mHeight = height;
     mFps = fps;
     mBitrate = bitrate;
-    ySize = width * height;
+    yLen = width * height;
-    uvSize = ySize / 4;
     if (videoCodec) {
         x264_encoder_close(videoCodec);
         videoCodec = nullptr;
@@ -78,26 +77,25 @@ void VideoStream::setVideoEncInfo(int width, int height, int fps, int bitrate) {
     pthread_mutex_unlock(&mutex);
 }
 
-void VideoStream::setVideoCallback(VideoCallback videoCallback) {
+void VideoStream::setVideoCallback(VideoCallback callback) {
-    this->videoCallback = videoCallback;
+    this->videoCallback = callback;
 }
 
 void VideoStream::encodeData(int8_t *data) {
     pthread_mutex_lock(&mutex);
     //y
-    memcpy(pic_in->img.plane[0], data, ySize);
+    memcpy(pic_in->img.plane[0], data, yLen);
-    for (int i = 0; i < uvSize; ++i) {
+    for (int i = 0; i < yLen/4; ++i) {
         //uv
-        *(pic_in->img.plane[1] + i) = *(data + ySize + i * 2 + 1);
+        *(pic_in->img.plane[1] + i) = *(data + yLen + i * 2 + 1);
-        *(pic_in->img.plane[2] + i) = *(data + ySize + i * 2);
+        *(pic_in->img.plane[2] + i) = *(data + yLen + i * 2);
     }
 
     x264_nal_t *pp_nal;
     int pi_nal;
     x264_picture_t pic_out;
     x264_encoder_encode(videoCodec, &pp_nal, &pi_nal, pic_in, &pic_out);
-    int sps_len = 0;
+    int pps_len, sps_len = 0;
-    int pps_len = 0;
     uint8_t sps[100];
     uint8_t pps[100];
     for (int i = 0; i < pi_nal; ++i) {
@@ -118,16 +116,15 @@ void VideoStream::encodeData(int8_t *data) {
 void VideoStream::encodeDataNew(int8_t *y_plane, int8_t *u_plane, int8_t *v_plane) {
     pthread_mutex_lock(&mutex);
 
-    memcpy(pic_in->img.plane[0], y_plane, (size_t) ySize);
+    memcpy(pic_in->img.plane[0], y_plane, (size_t) yLen);
-    memcpy(pic_in->img.plane[1], u_plane, (size_t) ySize / 4);
+    memcpy(pic_in->img.plane[1], u_plane, (size_t) yLen / 4);
-    memcpy(pic_in->img.plane[2], v_plane, (size_t) ySize / 4);
+    memcpy(pic_in->img.plane[2], v_plane, (size_t) yLen / 4);
 
     x264_nal_t *pp_nal;
     int pi_nal;
     x264_picture_t pic_out;
     x264_encoder_encode(videoCodec, &pp_nal, &pi_nal, pic_in, &pic_out);
-    int sps_len = 0;
+    int pps_len, sps_len = 0;
-    int pps_len = 0;
     uint8_t sps[100];
     uint8_t pps[100];
     for (int i = 0; i < pi_nal; ++i) {

Live/src/main/cpp/VideoStream.h

@@ -32,8 +32,7 @@ private:
     x264_t *videoCodec = 0;
     x264_picture_t *pic_in = 0;
 
-    int ySize;
+    int yLen;
-    int uvSize;
     VideoCallback videoCallback;
 
     void sendSpsPps(uint8_t *sps, uint8_t *pps, int sps_len, int pps_len);