Make it possible to set width/height on the command line, instead of compiling it...

[nageru] / x264_encoder.cpp

diff --git a/x264_encoder.cpp b/x264_encoder.cpp
index 9874519362aadf8a3059eb77f2e797243d230459..95d3625354c23ac539cb42917befcb5145c42e98 100644 (file)
--- a/x264_encoder.cpp
+++ b/x264_encoder.cpp
@@ -1,14 +1,20 @@
+#include "x264_encoder.h"
+
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <x264.h>
+#include <cstdint>
 
 #include "defs.h"
 #include "flags.h"
 #include "mux.h"
 #include "timebase.h"
-#include "x264_encoder.h"
 #include "x264_speed_control.h"
 
 extern "C" {
+#include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
 
@@ -35,9 +41,9 @@ void update_vbv_settings(x264_param_t *param)
 X264Encoder::X264Encoder(AVOutputFormat *oformat)
        : wants_global_headers(oformat->flags & AVFMT_GLOBALHEADER)
 {
-       frame_pool.reset(new uint8_t[WIDTH * HEIGHT * 2 * X264_QUEUE_LENGTH]);
+       frame_pool.reset(new uint8_t[global_flags.width * global_flags.height * 2 * X264_QUEUE_LENGTH]);
        for (unsigned i = 0; i < X264_QUEUE_LENGTH; ++i) {
-               free_frames.push(frame_pool.get() + i * (WIDTH * HEIGHT * 2));
+               free_frames.push(frame_pool.get() + i * (global_flags.width * global_flags.height * 2));
        }
        encoder_thread = thread(&X264Encoder::encoder_thread_func, this);
 }
@@ -66,7 +72,7 @@ void X264Encoder::add_frame(int64_t pts, int64_t duration, const uint8_t *data)
                free_frames.pop();
        }
 
-       memcpy(qf.data, data, WIDTH * HEIGHT * 2);
+       memcpy(qf.data, data, global_flags.width * global_flags.height * 2);
 
        {
                lock_guard<mutex> lock(mu);
@@ -80,8 +86,8 @@ void X264Encoder::init_x264()
        x264_param_t param;
        x264_param_default_preset(&param, global_flags.x264_preset.c_str(), global_flags.x264_tune.c_str());
 
-       param.i_width = WIDTH;
-       param.i_height = HEIGHT;
+       param.i_width = global_flags.width;
+       param.i_height = global_flags.height;
        param.i_csp = X264_CSP_NV12;
        param.b_vfr_input = 1;
        param.i_timebase_num = 1;
@@ -188,6 +194,7 @@ void X264Encoder::encoder_thread_func()
                // No exit; it's not fatal.
        }
        init_x264();
+       x264_init_done = true;
 
        bool frames_left;
 
@@ -238,9 +245,9 @@ void X264Encoder::encode_frame(X264Encoder::QueuedFrame qf)
                pic.img.i_csp = X264_CSP_NV12;
                pic.img.i_plane = 2;
                pic.img.plane[0] = qf.data;
-               pic.img.i_stride[0] = WIDTH;
-               pic.img.plane[1] = qf.data + WIDTH * HEIGHT;
-               pic.img.i_stride[1] = WIDTH / 2 * sizeof(uint16_t);
+               pic.img.i_stride[0] = global_flags.width;
+               pic.img.plane[1] = qf.data + global_flags.width * global_flags.height;
+               pic.img.i_stride[1] = global_flags.width / 2 * sizeof(uint16_t);
                pic.opaque = reinterpret_cast<void *>(intptr_t(qf.duration));
 
                input_pic = &pic;
@@ -271,6 +278,8 @@ void X264Encoder::encode_frame(X264Encoder::QueuedFrame qf)
                speed_control->after_frame();
        }
 
+       if (num_nal == 0) return;
+
        // We really need one AVPacket for the entire frame, it seems,
        // so combine it all.
        size_t num_bytes = buffered_sei.size();