44#include " VideoStream.h"
55#include " PushInterface.h"
66
7- VideoStream::VideoStream () {
7+ VideoStream::VideoStream ():yLen(0 ),
8+ mBitrate(0 ),
9+ videoCodec(nullptr ),
10+ pic_in(nullptr ),
11+ videoCallback(nullptr ) {
812 pthread_mutex_init (&mutex, nullptr );
913}
1014
@@ -22,9 +26,6 @@ VideoStream::~VideoStream() {
2226
2327void VideoStream::setVideoEncInfo (int width, int height, int fps, int bitrate) {
2428 pthread_mutex_lock (&mutex);
25- mWidth = width;
26- mHeight = height;
27- mFps = fps;
2829 mBitrate = bitrate;
2930 yLen = width * height;
3031 if (videoCodec) {
@@ -81,44 +82,24 @@ void VideoStream::setVideoCallback(VideoCallback callback) {
8182 this ->videoCallback = callback;
8283}
8384
84- void VideoStream::encodeData (int8_t *data) {
85+ void VideoStream::encodeVideo (int8_t *data, int8_t *y_plane, int8_t *u_plane, int8_t *v_plane ) {
8586 pthread_mutex_lock (&mutex);
86- // y
87- memcpy (pic_in->img .plane [0 ], data, yLen);
88- for (int i = 0 ; i < yLen/4 ; ++i) {
89- // uv
90- *(pic_in->img .plane [1 ] + i) = *(data + yLen + i * 2 + 1 );
91- *(pic_in->img .plane [2 ] + i) = *(data + yLen + i * 2 );
92- }
9387
94- x264_nal_t *pp_nal;
95- int pi_nal;
96- x264_picture_t pic_out;
97- x264_encoder_encode (videoCodec, &pp_nal, &pi_nal, pic_in, &pic_out);
98- int pps_len, sps_len = 0 ;
99- uint8_t sps[100 ];
100- uint8_t pps[100 ];
101- for (int i = 0 ; i < pi_nal; ++i) {
102- if (pp_nal[i].i_type == NAL_SPS ) {
103- sps_len = pp_nal[i].i_payload - 4 ;
104- memcpy (sps, pp_nal[i].p_payload + 4 , static_cast <size_t >(sps_len));
105- } else if (pp_nal[i].i_type == NAL_PPS ) {
106- pps_len = pp_nal[i].i_payload - 4 ;
107- memcpy (pps, pp_nal[i].p_payload + 4 , static_cast <size_t >(pps_len));
108- sendSpsPps (sps, pps, sps_len, pps_len);
109- } else {
110- sendFrame (pp_nal[i].i_type , pp_nal[i].p_payload , pp_nal[i].i_payload );
88+ if (data) {
89+ // y
90+ memcpy (pic_in->img .plane [0 ], data, yLen);
91+ // uv
92+ for (int i = 0 ; i < yLen/4 ; ++i) {
93+ *(pic_in->img .plane [1 ] + i) = *(data + yLen + i * 2 + 1 );
94+ *(pic_in->img .plane [2 ] + i) = *(data + yLen + i * 2 );
11195 }
96+ } else if (y_plane && u_plane && v_plane) {
97+ memcpy (pic_in->img .plane [0 ], y_plane, (size_t ) yLen);
98+ memcpy (pic_in->img .plane [1 ], u_plane, (size_t ) yLen / 4 );
99+ memcpy (pic_in->img .plane [2 ], v_plane, (size_t ) yLen / 4 );
100+ } else {
101+ return ;
112102 }
113- pthread_mutex_unlock (&mutex);
114- }
115-
116- void VideoStream::encodeDataNew (int8_t *y_plane, int8_t *u_plane, int8_t *v_plane) {
117- pthread_mutex_lock (&mutex);
118-
119- memcpy (pic_in->img .plane [0 ], y_plane, (size_t ) yLen);
120- memcpy (pic_in->img .plane [1 ], u_plane, (size_t ) yLen / 4 );
121- memcpy (pic_in->img .plane [2 ], v_plane, (size_t ) yLen / 4 );
122103
123104 x264_nal_t *pp_nal;
124105 int pi_nal;
0 commit comments