FFMPEG update log

[SageWizdom]

I'm going to try to consolidate comments about my efforts to update FFMPEG here. Right now I have comments in a couple of threads, I may try to drag them into this thread for completeness.

My Current Plan:
Get code as close to the release in SageTV
Compare them into the same version
ID SageTV modifications
attempt to forward patch those mods into the most recent version of FFMPEG

Some Questions:
What custom support as added to ffmpeg for Sage? I saw something about processing STV streams directly. I also saw something about conversion of names of codecs back and forth


Applicable Posts (that I have found so far):
http://forums.sagetv.com/forums/show...59&postcount=1
http://forums.sagetv.com/forums/show...peg#post576622

The code version appears to be:
0.4.9-pre1 < sage version < 0.5.0


Files with SageTV Code in them

ffmpeg.c

libavcodec/h263.c:
libavcodec/mpegvideo_enc.c
libavcodec/ratecontrol.h
libavcodec/utils.c:

libavformat/allformats.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/mov.c
libavformat/Makefile
libavformat/mpeg.c
libavformat/mpegenc.c
libavformat/oggdec.c
libavformat/stv.c

[SageWizdom]

I updated this comment to create a single merged and sorted list.

Grep for NARFLEX.
Grep for SageTV.
Grep for stv (I've included all the ones I think are right)

Are there any other names I should look for in the code for comments? Thanks

ffmpeg.c:1149:// NARFLEX: I disabled this because it can still work even if this happens so there's no reason to bail!

libavcodec/h263.c:665-670: // NARFLEX: SageTV Fix divide by zero errors that can happen here

libavcodec/mpegvideo_enc.c:893:// NARFLEX: Disable this block and add above instead like they used to, it's causing FFMPEG to crash on placeshifter transcoding
libavcodec/mpegvideo_enc.c:1193: // NARFLEX: Disable this secondary if block, it's causing FFMPEG to crash on placeshifter transcoding
libavcodec/mpegvideo_enc.c:1282:// NARFLEX: Disable this block, it's causing FFMPEG to crash on placeshifter transcoding
libavcodec/mpegvideo_enc.c:2706:// NARFLEX: Doing dynamic adjustment of q based on bitrate has turned out to give pretty poor

libavcodec/ratecontrol.h:83: int last_frame_rc_reset; /// Narflex: for dynamic rate control

libavcodec/utils.c:1133: /* NARFLEX: We don't want DAR/PAR in the output string

libavformat/allformats.c: REGISTER_PROTOCOL (STV, stv);

libavformat/avidec.c:836: // Narflex - but they've changed this in the latest version of FFMPEG so I no longer am sure this is needed

libavformat/flvdec.c:477: // NOTE: Narflex - do not read in the duration here because it requires seeking to the end of

libavformat/Makefile:OBJS-$(CONFIG_STV_PROTOCOL) += stv.o

libavformat/mov.c:1598://{ MKTAG( 'u', 'd', 't', 'a' ), mov_read_udta }, // NARFLEX: We want to do more detailed metadata parsing then what's in here, so use the default tag handler
libavformat/mov.c:1807: // NARFLEX: Since we don't pass around the AVFormatParameters, but we need to know whether or not

libavformat/mpeg.c:90: // NARFLEX: I've seen FLAC files with audio:2, so let's set it higher for safety
libavformat/mpeg.c:134: // NARFLEX: This is in here to deal with MPEG2 files I keep running into that start with timestamps
libavformat/mpeg.c:378: // NARFLEX - I have no idea why they don't strip off the audio header junk

libavformat/mpegenc.c:1176: // NARFLEX: SageTV, force I frame alignment if we're doing IFrame only mode since the PPC MPEG2 decoder requires that for parsing timestamps

libavformat/oggdec.c:302:// NARFLEX: Add 'ap' so we can detect dump_metadata bit being set
libavformat/oggdec.c:332: // NARFLEX: This is where we extract the metadata from the OGG file and dump it
libavformat/oggdec.c:443: // NARFLEX: Add 'ap' so we can detect dump_metadata bit being set
libavformat/oggdec.c:494: // NARFLEX: SageTV, I added the '&& !i' to this conditional so it took the first stream.
libavformat/oggdec.c:530: // NARFLEX: Add 'ap' so we can detect dump_metadata bit being set
libavformat/oggdec.c:553: // NARFLEX: Add 'ap' (NULL) so we can detect dump_metadata bit being set

libavformat/stv.c:2: * SageTV Streaming protocol for ffmpeg client
libavformat/stv.c:21: * This allows you to stream files directly from a SageTV server
libavformat/stv.c:162: av_log(NULL, AV_LOG_ERROR, "Opening conn to SageTV server\n");
libavformat/stv.c:335: av_log(NULL, AV_LOG_ERROR, "Sending cmd to SageTV Server:%s", data);
libavformat/stv.c:447: av_log(NULL, AV_LOG_ERROR, "Sending2 cmd to SageTV Server:%s\n", data);
libavformat/stv.c:592: av_log(NULL, AV_LOG_ERROR, "Sending cmd to SageTV Server:%s\n", data);

[SageWizdom]

(edited) Moved into the above comment

[stuckless]

This is similar to what I did when I worked on the mplayer stuff... the only other thing that I did was use MELD and do a directory compare against the 2 versions... the problem is that even with the sources that Jeff provided, there were lots of changes, and not all of them were sagetv changes... but it did help once I narrowed things down.

The other thing that I would look for is STV.. I think there some cases where stv shows up instead of sagetv.

I think if look in the configure scripts you might see some sagetv defines in there (that don't have sagetv in them... I just trying to remember from the mlayer work) and then search for those defines.

[SageWizdom]

You are definitely correct. I found a bunch of STV instances. I'll have to look at MELD, I've always used BeyondCompare which does the directory compare, then lets you drill down into the source file compare (which I then merge).

Thanks

[stuckless]

Originally Posted by SageWizdom

You are definitely correct. I found a bunch of STV instances. I'll have to look at MELD, I've always used BeyondCompare which does the directory compare, then lets you drill down into the source file compare (which I then merge).

Thanks

I think that Beyond Compare is probably a better tool, but meld is what I have on linux

[SageWizdom]

Originally Posted by stuckless

I think that Beyond Compare is probably a better tool, but meld is what I have on linux

BC is what I'm using on Linux. Back in the day it was Windows only, but it now works everywhere. If you want to try it, it has a free 30 day trial.

http://www.scootersoftware.com/download.php

[wayner]

Will updating FFMPEG fix the issues with Placeshifter not properly playing some files, like 1080i H.264 files.

[SageWizdom]

Originally Posted by wayner

Will updating FFMPEG fix the issues with Placeshifter not properly playing some files, like 1080i H.264 files.

Great question. I don't know. I know that on Mac, FFMPEG is used in the SageClient, but I have not dug into Placeshifter.

[wayner]

Here is a post from Fuzzy where he says that Sage uses an older version of FFMPEG that has known issues with interlaced H.264 content.

http://forums.sagetv.com/forums/show...7&postcount=16

[Monedeath]

Originally Posted by wayner

Here is a post from Fuzzy where he says that Sage uses an older version of FFMPEG that has known issues with interlaced H.264 content.

http://forums.sagetv.com/forums/show...7&postcount=16

That only applies to pre SageTV7 users.

[SageWizdom]

Jeff posted an updated version to github. I'll grab that one and do some more compares.

http://forums.sagetv.com/forums/show...83&postcount=1

[wayner]

I am pretty sure that I have tried Placeshifter V9 with H.264 1080i content from an HD-PVR and it doesn't work, at least not on Windows.

[SageWizdom]

Ok, I've chewed through the new code drop and compared to the old one. I found a few more items. Of specific note, there are now 4 terms I suggest searching for in the code (anyone know of any more?)

sagetv, narflex, jft (another developer) and stv

grep -nir sagetv *
grep -nir narflex *
grep -nir jft *
grep -nir stv *


ffmpeg.c:1693:// NARFLEX: I disabled this because it can still work even if this happens so there's no reason to bail!
libavcodec/avcodec.h:342: /* STV: HD audio codecs for detection purposes (not fully decoded) */
libavcodec/dca.c:1289: // JFT, so we only look at 1 frame when looking for DTS-HD/DTS-MA
libavcodec/h264_parser.c:197: // STV: at least one interlaced frame will mark the stream as interlaced
libavcodec/libx264.c:92: // NARFLEX: See if the bitrate information has changed, and if so, reconfigure the encoder
libavcodec/mpeg4video.c:150: // NARFLEX: SageTV Fix divide by zero errors that can happen here
libavcodec/mpegvideo_enc.c:885:// NARFLEX: Disable this block and add above instead like they used to, it's causing FFMPEG to crash on placeshifter transcoding
libavcodec/mpegvideo_enc.c:1185: // NARFLEX: Disable this secondary if block, it's causing FFMPEG to crash on placeshifter transcoding
libavcodec/mpegvideo_enc.c:1278:// NARFLEX: Disable this block, it's causing FFMPEG to crash on placeshifter transcoding
libavcodec/mpegvideo_enc.c:2712:// NARFLEX: Doing dynamic adjustment of q based on bitrate has turned out to give pretty poor
libavcodec/ratecontrol.h:83: int last_frame_rc_reset; /// Narflex: for dynamic rate control
libavcodec/utils.c:883: /* NARFLEX: We don't want DAR/PAR in the output string
libavcodec/utils.c:898: laced = 1; // STV: for some reason H.264 reports 2x frame rate (field rate)


libavformat/allformats.c:237: REGISTER_PROTOCOL (STV, stv); //SAGETV
libavformat/avidec.c:861: // JFT, we don't have a start point, try going where we found MOVI
libavformat/avidec.c:978: // Narflex - but they've changed this in the latest version of FFMPEG so I no longer am sure this is needed
libavformat/avidec.c:1064: // JFT, when discarding use size not packet size
libavformat/flacdec.c:98: // SageTV: report picture size and offset for external extraction
libavformat/flvdec.c:469: // NOTE: Narflex - do not read in the duration here because it requires seeking to the end of
libavformat/Makefile:298:OBJS-$(CONFIG_STV_PROTOCOL) += stv.o
libavformat/matroskadec.c:22:// JFT: Added binblock to improve streaming and remove unneeded copy
libavformat/matroskadec.c:832: // JFT: especially needed when we have no MMU
libavformat/matroskadec.c:1453: // NARFLEX - disable extraction of the individual track titles
libavformat/matroskadec.c:1535: // NARFLEX: Add metadata for the start of each chapter
libavformat/matroskadec.c:1859: // JFT: Basic version of no copy for special case...
libavformat/matroskadec.c:1991: // NARFLEX: This is a BUG where they use the index from the wrong track below in the comparison so it can end up accessing an invalid index
libavformat/mov.c:214: // SageTV: Truncate "year" so it really only reports the year instead of the full date
libavformat/mov.c:2265: // SageTV added tags
libavformat/mov.c:2390:// SageTV added tags
libavformat/mov.c:2820: // JFT verify that's right in all cases...
libavformat/mpeg.c:138: // NARFLEX: This is in here to deal with MPEG2 files I keep running into that start with timestamps
libavformat/mpeg.c:303: /* STV: special case broken PS files produced by a bug in our muxer that created 0x00000100 start codes on some audio PES packets */
libavformat/mpeg.c:414: // NARFLEX - I have no idea why they don't strip off the audio header junk
libavformat/mpeg.c:512: // JFT: If we don't know the type use other detection methods
libavformat/mpegenc.c:1184: // NARFLEX: SageTV, force I frame alignment if we're doing IFrame only mode since the PPC MPEG2 decoder requires that for parsing timestamps
libavformat/mpegts.c:575:// NARFLEX - we don't want another stream for AC3 inside of TrueHD; that just messes things up
libavformat/stv.c:2: * SageTV Streaming protocol for ffmpeg client
libavformat/stv.c:21: * This allows you to stream files directly from a SageTV server
libavformat/stv.c:176: av_log(NULL, AV_LOG_ERROR, "Opening conn to SageTV server\n");
libavformat/stv.c:326: av_log(NULL, AV_LOG_ERROR, "Sending cmd to SageTV Server:%s\n", data);
libavformat/stv.c:365: av_log(NULL, AV_LOG_ERROR, "Sending cmd to SageTV Server:%s", data);
libavformat/stv.c:477: av_log(NULL, AV_LOG_ERROR, "Sending2 cmd to SageTV Server:%s\n", data);
libavformat/stv.c:610:// Test JFT
libavformat/stv.c:619: av_log(NULL, AV_LOG_ERROR, "Sending cmd to SageTV Server:%s\n", data);
libavformat/utils.c:740: // NARFLEX - audio in DVR-MS files will fail if we don't subtract 1 since it gets a score of 25
libavformat/utils.c:756: // NARFLEX: David had set this at 1MB; but we had MPEG2PS recordings that failed unless it was 2MB

It looks like this code base is an early v.0.6. I'm going to try and merge into the last .6 build (6.6.4 or something like that).

The question to the crowd, just looking at the v0.5 code and the v0.6 code, there are lots of changes. I think I can patch them into the newest, but I'm not even sure how they were found. I'll try to compile the v.0.6 once I patch in and will let folks know how it went.

[Narflex]

Don't rely on those greps for finding everything...you will miss things. And did you see that I also posted the FFMPEG upstream version that the one in GitHub was forked from? That'll make figuring out the changes super easy. (I don't remember exactly where i posted it...just search for recent posts by me with FFMPEG in them)

[dinki]

Originally Posted by Narflex

Don't rely on those greps for finding everything...you will miss things. And did you see that I also posted the FFMPEG upstream version that the one in GitHub was forked from? That'll make figuring out the changes super easy. (I don't remember exactly where i posted it...just search for recent posts by me with FFMPEG in them)

http://forums.sagetv.com/forums/show...95&postcount=6

[SageWizdom]

Thanks. I just pulled the link and will do another round.

@NARFLEX
Did you guys really add the code for EM8622UNCACHED, and the integration of OGG, LIGFAAD and DTSHD/DTSMA?

I'm trying to think of how to integrate and port forward, and I was hoping to use all the protocols as used / supported in ffmpeg and just bring in the custom STV types.

If you remember what you all were adding and why (perhaps wax philosophically), it would be of tremendous assistance in understanding why this versus that an the goals.

Thank you

[SageWizdom]

Originally Posted by SageWizdom

@NARFLEX
Did you guys really add the code for EM8622UNCACHED, and the integration of OGG, LIGFAAD and DTSHD/DTSMA?

I re-read this realize this does not read the way I intended. Which was really, in comparing things, I see the above types of things and I'm curious if this is something you guys added vs still being slightly off on the version and trying to figure out which bits are sage critical and which are just normally part of FFMPEG

[Narflex]

We did add all of the EM8622UNCACHED stuff...but go ahead and remove it all. That was for running on the HD100 media extender and that'll never be compiled again.

For OGG, LIBFAAD and DTSHD/MA; we did add those in there...BUT we pulled all of that from upstream versions of FFMPEG at the time (i.e. rather than porting all of FFMPEG to a newer version; we just grabbed those files and included them into our version...however it's possible we did fix extra issues in them).

There's really 3 types of changes you'll find in there:

1. SageTV feature additions; things like rate control for placeshifting, stv protocol handler, support for files that are growing while being accessed...basically features we needed to add to FFMPEG to make it work for SageTV in the ways we wanted to

2. Upstream feature pulls; things we wanted in the version of FFMPEG we were using...but were in newer versions, so we just pulled in those files to get those features

3. Bug fixes. Customers had issues...we had to fix them...so sometimes we had to fix bugs in FFMPEG.

Ideally, you would just be porting #1...because #2 should happen automatically with any newer version of FFMPEG you port to; and ideally they've fixed the bugs in #3 that we fixed in our version. However, I'm not sure they've fixed all of #3; but if new issues come up...the diffs there could be used as a point of reference for what the bugs were in FFMPEG that we fixed and maybe that those fixes need to be ported to a newer version as well.

[JREkiwi]

Originally Posted by Narflex

2. Upstream feature pulls; things we wanted in the version of FFMPEG we were using...but were in newer versions, so we just pulled in those files to get those features

I know one of the things was the LATM support that was needed for the NZ and UK AAC DVB audio.

John