zishuo/opencv-mobile
1
0
Fork 0
mirror of https://github.com/nihui/opencv-mobile.git synced 2025-10-05 08:36:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix http jpg streaming data corrupt (#187)

Browse Source
This commit is contained in:
nihui
2025-04-21 00:17:08 +08:00
committed by GitHub
parent 905c83a1b7
commit f6430431e0
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
highgui/src/videowriter.cpp
View File

@@ -133,7 +133,7 @@ void VideoWriter::write(const Mat& image)
std::vector<uchar> buf; std::vector<uchar> buf;
cv::imencode(".JPG", image, buf); cv::imencode(".JPG", image, buf);
d->wt_http.write_jpgbuf((const unsigned char*)buf.data(), buf.size()); d->wt_http.write_jpgbuf(buf);
} }
else else
#endif #endif

16
highgui/src/writer_http.cpp
View File

@@ -138,7 +138,7 @@ public:
int open(int port); int open(int port);
void write_jpgbuf(const unsigned char* jpg_data, int size); void write_jpgbuf(const std::vector<unsigned char>& jpgbuf);
void close(); void close();
@@ -153,6 +153,7 @@ public:
void mainloop(); void mainloop();
// cv::Mat bgr_to_send; // cv::Mat bgr_to_send;
std::vector<unsigned char> jpgbuf;
const unsigned char* jpg_data; const unsigned char* jpg_data;
int jpg_size; int jpg_size;
int exit_flag; int exit_flag;
@@ -215,7 +216,7 @@ int writer_http_impl::open(int _port)
return 0; return 0;
} }
void writer_http_impl::write_jpgbuf(const unsigned char* _jpg_data, int size) void writer_http_impl::write_jpgbuf(const std::vector<unsigned char>& _jpgbuf)
{ {
if (!looper) if (!looper)
return; return;
@@ -227,8 +228,9 @@ void writer_http_impl::write_jpgbuf(const unsigned char* _jpg_data, int size)
pthread_cond_wait(&cond, &mutex); pthread_cond_wait(&cond, &mutex);
} }
jpg_data = _jpg_data; jpgbuf = _jpgbuf;
jpg_size = size; jpg_data = jpgbuf.data();
jpg_size = jpgbuf.size();
} }
pthread_mutex_unlock(&mutex); pthread_mutex_unlock(&mutex);
@@ -350,7 +352,7 @@ void writer_http_impl::mainloop()
client.send((const char*)jpg_data, jpg_size); client.send((const char*)jpg_data, jpg_size);
// fprintf(stderr, "[INFO] 4\n"); // fprintf(stderr, "[INFO] 4 %4s\n", jpg_data);
client.send("\r\n--frame\r\n", 11); client.send("\r\n--frame\r\n", 11);
} }
@@ -460,9 +462,9 @@ int writer_http::open(int port)
return d->open(port); return d->open(port);
} }
void writer_http::write_jpgbuf(const unsigned char* jpgdata, int size) void writer_http::write_jpgbuf(const std::vector<unsigned char>& jpgbuf)
{ {
d->write_jpgbuf(jpgdata, size); d->write_jpgbuf(jpgbuf);
} }
void writer_http::close() void writer_http::close()

4
highgui/src/writer_http.h
View File

@@ -17,6 +17,8 @@
#ifndef WRITER_HTTP_H #ifndef WRITER_HTTP_H
#define WRITER_HTTP_H #define WRITER_HTTP_H
#include <vector>
namespace cv { namespace cv {
class writer_http_impl; class writer_http_impl;
@@ -30,7 +32,7 @@ public:
int open(int port); int open(int port);
void write_jpgbuf(const unsigned char* jpg_data, int size); void write_jpgbuf(const std::vector<unsigned char>& jpgbuf);
void close(); void close();