Commit ee8a759d authored by xiaoqiang's avatar xiaoqiang

fix merge mistakes

parent b7d93165
......@@ -53,12 +53,8 @@ public:
~Vp8Streamer();
protected:
virtual void initializeEncoder();
// codec options
private:
std::string quality_;
int bitrate_;
int qmin_;
int qmax_;
int gop_;
};
class Vp8StreamerType : public LibavStreamerType
......
/**
\mainpage
\b A ROS Node to Stream Image Topics Via multiple formats including MJPEG, H.264 and VP8
\b A ROS Node to Stream Image Topics Via multiple formats including MJPEG and VP8
web_video_server converts ROS image streams into an MJPEG or other encoding and streams them via a socket connection.
*/
......@@ -58,7 +58,7 @@ void JpegSnapshotStreamer::sendImage(const cv::Mat &img, const ros::Time &time)
cv::imencode(".jpeg", img, encoded_buffer, encode_params);
char stamp[20];
std::snprintf(stamp, sizeof(stamp), "%.06lf", time.toSec());
sprintf(stamp, "%.06lf", time.toSec());
async_web_server_cpp::HttpReply::builder(async_web_server_cpp::HttpReply::ok).header("Connection", "close").header(
"Server", "web_video_server").header("Cache-Control",
"no-cache, no-store, must-revalidate, pre-check=0, post-check=0, max-age=0").header(
......
......@@ -18,7 +18,7 @@ void MultipartStream::sendInitialHeader() {
void MultipartStream::sendPartHeader(const ros::Time &time, const std::string& type, size_t payload_size) {
char stamp[20];
std::snprintf(stamp, sizeof(stamp), "%.06lf", time.toSec());
sprintf(stamp, "%.06lf", time.toSec());
boost::shared_ptr<std::vector<async_web_server_cpp::HttpHeader> > headers(
new std::vector<async_web_server_cpp::HttpHeader>());
headers->push_back(async_web_server_cpp::HttpHeader("Content-type", type));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment