X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.cpp;h=f266c63656d17cb14cce47c4886573159d61e5da;hb=be250b0bb36e5cca60feb810461c116495bcc357;hp=38e685e6e8d0b4a2064590426a4714a24756f71c;hpb=4ec330853ee13b230f089253fedd20b49229e42b;p=nageru diff --git a/httpd.cpp b/httpd.cpp index 38e685e..f266c63 100644 --- a/httpd.cpp +++ b/httpd.cpp @@ -89,6 +89,17 @@ HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height) avstream_video->codec->time_base = AVRational{1, TIMEBASE}; avstream_video->codec->ticks_per_frame = 1; // or 2? + // Colorspace details. Closely correspond to settings in EffectChain_finalize, + // as noted in each comment. + // Note that the H.264 stream also contains this information and depending on the + // mux, this might simply get ignored. See sps_rbsp(). + avstream_video->codec->color_primaries = AVCOL_PRI_BT709; // RGB colorspace (inout_format.color_space). + avstream_video->codec->color_trc = AVCOL_TRC_UNSPECIFIED; // Gamma curve (inout_format.gamma_curve). + avstream_video->codec->colorspace = AVCOL_SPC_SMPTE170M; // YUV colorspace (output_ycbcr_format.luma_coefficients). + avstream_video->codec->color_range = AVCOL_RANGE_MPEG; // Full vs. limited range (output_ycbcr_format.full_range). + avstream_video->codec->chroma_sample_location = AVCHROMA_LOC_LEFT; // Chroma sample location. See chroma_offset_0[] in Mixer::subsample_chroma(). + avstream_video->codec->field_order = AV_FIELD_PROGRESSIVE; + AVCodec *codec_audio = avcodec_find_encoder(AV_CODEC_ID_MP3); avstream_audio = avformat_new_stream(avctx, codec_audio); if (avstream_audio == nullptr) {