[Ffmpeg-devel] [PATCH] - fix for missing audio stream in dvr-ms asf files

[John Donaghy]

The attached patch is for asf.c/asf.h and enables the code to find the
audio stream in dvr-ms files. The audio stream is embedded in the
header extension object (head1_guid) so I took out the '#if 0' like
that causes that whole section to be skipped. It took a bit of
guesswork to discover the audio stream but I knew it had to be there
somewhere. The associated guids for it have not been published so the
names I gave the new guids may not properly convey their meaning.
A dvr-ms file has a couple of extended stream properties objects
embedded in the header extension object. One is the audio and the
other is probably the subtitles but this code only recognises the
audio. Once an extended stream properties is parsed there is a
optional stream object immediately following. Hence I included some
code to just parse the extended stream properties object up to the
start of the optional stream object. That way the stream object gets
picked up on the next iteration if it is present. Since the guid is
not the regular audio guid I added code to process it as an audio
stream header if it matched the right guid.
It all seems to work fine in mplayer and I've also used mencoder to
successfully convert these files into a couple of other formats. I did
all development in mingw and I havent test it in any other
environment. I also havent checked if the changes didnt break regular
asf files cause I dont have any but I can do some of this if required
later.

John
-------------- next part --------------
SW5kZXg6IGxpYmF2Zm9ybWF0L2FzZi5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvZmZtcGVnL2ZmbXBlZy9saWJhdmZvcm1hdC9hc2YuYyx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuOTANCmRpZmYgLXUgLXIxLjkwIGFzZi5jDQotLS0gbGliYXZmb3JtYXQvYXNmLmMJMTIgSmFuIDIwMDYgMjI6NDM6MjIgLTAwMDAJMS45MA0KKysrIGxpYmF2Zm9ybWF0L2FzZi5jCTIwIEphbiAyMDA2IDE4OjM5OjI3IC0wMDAwDQpAQCAtNjAsNiArNjAsMTAgQEANCiAgICAgZWxzZSBQUklOVF9JRl9HVUlEKGcsIGhlYWQxX2d1aWQpOw0KICAgICBlbHNlIFBSSU5UX0lGX0dVSUQoZywgaGVhZDJfZ3VpZCk7DQogICAgIGVsc2UgUFJJTlRfSUZfR1VJRChnLCBteV9ndWlkKTsNCisgICAgZWxzZSBQUklOVF9JRl9HVUlEKGcsIGV4dF9zdHJlYW1faGVhZGVyKTsNCisgICAgZWxzZSBQUklOVF9JRl9HVUlEKGcsIGV4dGVuZGVkX2NvbnRlbnRfaGVhZGVyKTsNCisgICAgZWxzZSBQUklOVF9JRl9HVUlEKGcsIGV4dF9zdHJlYW1fZW1iZWRfc3RyZWFtX2hlYWRlcik7DQorICAgIGVsc2UgUFJJTlRfSUZfR1VJRChnLCBleHRfc3RyZWFtX2F1ZGlvX3N0cmVhbSk7DQogICAgIGVsc2UNCiAgICAgICAgIHByaW50ZigiKEdVSUQ6IHVua25vd24pICIpOw0KICAgICBwcmludGYoIjB4JTA4eCwgMHglMDR4LCAweCUwNHgsIHsiLCBnLT52MSwgZy0+djIsIGctPnYzKTsNCkBAIC0yMDEsMTIgKzIwNSwxOCBAQA0KICAgICAgICAgICAgIHN0LT5kdXJhdGlvbiA9IGFzZi0+aGRyLnNlbmRfdGltZSAvDQogICAgICAgICAgICAgICAgICgxMDAwMDAwMCAvIDEwMDApIC0gc3QtPnN0YXJ0X3RpbWU7DQogICAgICAgICAgICAgZ2V0X2d1aWQocGIsICZnKTsNCisgICAgICAgICAgICANCisgICAgICAgICAgICBpbnQgdGVzdF9mb3JfZXh0X3N0cmVhbV9hdWRpbzsNCisgICAgICAgICAgICB0ZXN0X2Zvcl9leHRfc3RyZWFtX2F1ZGlvID0gMDsNCiAgICAgICAgICAgICBpZiAoIW1lbWNtcCgmZywgJmF1ZGlvX3N0cmVhbSwgc2l6ZW9mKEdVSUQpKSkgew0KICAgICAgICAgICAgICAgICB0eXBlID0gQ09ERUNfVFlQRV9BVURJTzsNCiAgICAgICAgICAgICB9IGVsc2UgaWYgKCFtZW1jbXAoJmcsICZ2aWRlb19zdHJlYW0sIHNpemVvZihHVUlEKSkpIHsNCiAgICAgICAgICAgICAgICAgdHlwZSA9IENPREVDX1RZUEVfVklERU87DQogICAgICAgICAgICAgfSBlbHNlIGlmICghbWVtY21wKCZnLCAmY29tbWFuZF9zdHJlYW0sIHNpemVvZihHVUlEKSkpIHsNCiAgICAgICAgICAgICAgICAgdHlwZSA9IENPREVDX1RZUEVfVU5LTk9XTjsNCisgICAgICAgICAgICB9IGVsc2UgaWYgKCFtZW1jbXAoJmcsICZleHRfc3RyZWFtX2VtYmVkX3N0cmVhbV9oZWFkZXIsIHNpemVvZihHVUlEKSkpIHsNCisgICAgICAgICAgICAgICAgdGVzdF9mb3JfZXh0X3N0cmVhbV9hdWRpbyA9IDE7DQorICAgICAgICAgICAgICAgIHR5cGUgPSBDT0RFQ19UWVBFX1VOS05PV047DQogICAgICAgICAgICAgfSBlbHNlIHsNCiAgICAgICAgICAgICAgICAgZ290byBmYWlsOw0KICAgICAgICAgICAgIH0NCkBAIC0yMTksNiArMjI5LDIwIEBADQogICAgICAgICAgICAgYXNmLT5hc2ZpZDJhdmlkW3N0LT5pZF0gPSBzLT5uYl9zdHJlYW1zIC0gMTsNCiANCiAgICAgICAgICAgICBnZXRfbGUzMihwYik7DQorDQorICAgICAgICAgICAgaWYgKHRlc3RfZm9yX2V4dF9zdHJlYW1fYXVkaW8pIHsNCisgICAgICAgICAgICAgICAgZ2V0X2d1aWQocGIsICZnKTsNCisgICAgICAgICAgICAgICAgaWYgKCFtZW1jbXAoJmcsICZleHRfc3RyZWFtX2F1ZGlvX3N0cmVhbSwgc2l6ZW9mKEdVSUQpKSkgeyAgICAgICAgICAgIA0KKyAgICAgICAgICAgICAgICAgICAgdHlwZSA9IENPREVDX1RZUEVfQVVESU87DQorICAgICAgICAgICAgICAgICAgICBnZXRfZ3VpZChwYiwgJmcpOw0KKyAgICAgICAgICAgICAgICAgICAgZ2V0X2xlMzIocGIpOw0KKyAgICAgICAgICAgICAgICAgICAgZ2V0X2xlMzIocGIpOw0KKyAgICAgICAgICAgICAgICAgICAgZ2V0X2xlMzIocGIpOw0KKyAgICAgICAgICAgICAgICAgICAgZ2V0X2d1aWQocGIsICZnKTsgICAgICAgICAgICAgICAgDQorICAgICAgICAgICAgICAgICAgICBnZXRfbGUzMihwYik7ICAgICAgICAgICAgICAgICAgICANCisgICAgICAgICAgICAgICAgfQ0KKyAgICAgICAgICAgIH0NCisNCiAgICAgICAgICAgICBzdC0+Y29kZWMtPmNvZGVjX3R5cGUgPSB0eXBlOw0KICAgICAgICAgICAgIGlmICh0eXBlID09IENPREVDX1RZUEVfQVVESU8pIHsNCiAgICAgICAgICAgICAgICAgZ2V0X3dhdl9oZWFkZXIocGIsIHN0LT5jb2RlYywgdHlwZV9zcGVjaWZpY19zaXplKTsNCkBAIC0yNTksNyArMjgzLDcgQEANCiAgICAgICAgICAgICAgICAgICAgIHN0LT5jb2RlYy0+ZnJhbWVfc2l6ZSA9IDE7DQogICAgICAgICAgICAgICAgICAgICBicmVhazsNCiAgICAgICAgICAgICAgICAgfQ0KLSAgICAgICAgICAgIH0gZWxzZSB7DQorICAgICAgICAgICAgfSBlbHNlIGlmICh0eXBlID09IENPREVDX1RZUEVfVklERU8pIHsNCiAgICAgICAgICAgICAgICAgZ2V0X2xlMzIocGIpOw0KICAgICAgICAgICAgICAgICBnZXRfbGUzMihwYik7DQogICAgICAgICAgICAgICAgIGdldF9ieXRlKHBiKTsNCkBAIC0zNDksMTIgKzM3Myw0OSBAQA0KICAgICAgICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICAgICAgICAgICBhdl9mcmVlKG5hbWUpOw0KICAgICAgICAgICAgICAgICB9DQotI2lmIDANCisgICAgICAgIH0gZWxzZSBpZiAoIW1lbWNtcCgmZywgJmV4dF9zdHJlYW1faGVhZGVyLCBzaXplb2YoR1VJRCkpKSB7DQorICAgICAgICAgICAgaW50IGV4dF9sZW4sIHBheWxvYWRfZXh0X2N0LCBzdHJlYW1fY3Q7DQorICAgICAgICAgICAgdWludDMyX3QgZXh0X2Q7DQorICAgICAgICAgICAgaW50NjRfdCBwb3NfZXhfc3QsIHBvc19jdXJyOw0KKyAgICAgICAgICAgIHBvc19leF9zdCA9IHVybF9mdGVsbChwYik7DQorICAgICAgICAgICAgDQorICAgICAgICAgICAgZ2V0X2xlNjQocGIpOw0KKyAgICAgICAgICAgIGdldF9sZTY0KHBiKTsNCisgICAgICAgICAgICBnZXRfbGUzMihwYik7DQorICAgICAgICAgICAgZ2V0X2xlMzIocGIpOw0KKyAgICAgICAgICAgIGdldF9sZTMyKHBiKTsNCisgICAgICAgICAgICBnZXRfbGUzMihwYik7DQorICAgICAgICAgICAgZ2V0X2xlMzIocGIpOw0KKyAgICAgICAgICAgIGdldF9sZTMyKHBiKTsNCisgICAgICAgICAgICBnZXRfbGUzMihwYik7DQorICAgICAgICAgICAgZ2V0X2xlMzIocGIpOw0KKyAgICAgICAgICAgIGdldF9sZTE2KHBiKTsNCisgICAgICAgICAgICBnZXRfbGUxNihwYik7DQorICAgICAgICAgICAgZ2V0X2xlNjQocGIpOw0KKyAgICAgICAgICAgIHN0cmVhbV9jdCA9IGdldF9sZTE2KHBiKTsNCisgICAgICAgICAgICBwYXlsb2FkX2V4dF9jdCA9IGdldF9sZTE2KHBiKTsNCisgICAgICAgICAgICANCisgICAgICAgICAgICBmb3IgKGk9MDsgaTxzdHJlYW1fY3Q7IGkrKyl7DQorICAgICAgICAgICAgICAgIGdldF9sZTE2KHBiKTsNCisgICAgICAgICAgICAgICAgZXh0X2xlbiA9IGdldF9sZTE2KHBiKTsNCisgICAgICAgICAgICAgICAgdXJsX2ZzZWVrKHBiLCBleHRfbGVuLCBTRUVLX0NVUik7DQorICAgICAgICAgICAgfQ0KKyAgICAgICAgICAgIA0KKyAgICAgICAgICAgIGZvciAoaT0wOyBpPHBheWxvYWRfZXh0X2N0OyBpKyspew0KKyAgICAgICAgICAgICAgICBnZXRfZ3VpZChwYiwgJmcpOw0KKyAgICAgICAgICAgICAgICBleHRfZD1nZXRfbGUxNihwYik7DQorICAgICAgICAgICAgICAgIGV4dF9sZW49Z2V0X2xlMzIocGIpOw0KKyAgICAgICAgICAgICAgICB1cmxfZnNlZWsocGIsIGV4dF9sZW4sIFNFRUtfQ1VSKTsNCisgICAgICAgICAgICB9DQorDQorICAgICAgICAgICAgLy8gdGhlcmUgY291bGQgYmUgYSBvcHRpb25hbCBzdHJlYW0gcHJvcGVydGllcyBvYmplY3QgdG8gZm9sbG93DQorICAgICAgICAgICAgLy8gaWYgc28gdGhlIG5leHQgaXRlcmF0aW9uIHdpbGwgcGljayBpdCB1cA0KICAgICAgICAgfSBlbHNlIGlmICghbWVtY21wKCZnLCAmaGVhZDFfZ3VpZCwgc2l6ZW9mKEdVSUQpKSkgew0KICAgICAgICAgICAgIGludCB2MSwgdjI7DQogICAgICAgICAgICAgZ2V0X2d1aWQocGIsICZnKTsNCiAgICAgICAgICAgICB2MSA9IGdldF9sZTMyKHBiKTsNCiAgICAgICAgICAgICB2MiA9IGdldF9sZTE2KHBiKTsNCisjaWYgMA0KICAgICAgICAgfSBlbHNlIGlmICghbWVtY21wKCZnLCAmY29kZWNfY29tbWVudF9oZWFkZXIsIHNpemVvZihHVUlEKSkpIHsNCiAgICAgICAgICAgICBpbnQgbGVuLCB2MSwgbiwgbnVtOw0KICAgICAgICAgICAgIGNoYXIgc3RyWzI1Nl0sICpxOw0KSW5kZXg6IGxpYmF2Zm9ybWF0L2FzZi5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvZmZtcGVnL2ZmbXBlZy9saWJhdmZvcm1hdC9hc2YuaCx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNjkNCmRpZmYgLXUgLXIxLjY5IGFzZi5oDQotLS0gbGliYXZmb3JtYXQvYXNmLmgJMTIgSmFuIDIwMDYgMjI6NDM6MjIgLTAwMDAJMS42OQ0KKysrIGxpYmF2Zm9ybWF0L2FzZi5oCTIwIEphbiAyMDA2IDE4OjM5OjI4IC0wMDAwDQpAQCAtMTQzLDEwICsxNDMsMTYgQEANCiAgICAgMHhCN0RDMDc5MSwgMHhBOUI3LCAweDExQ0YsIHsgMHg4RSwgMHhFNiwgMHgwMCwgMHhDMCwgMHgwQywgMHgyMCwgMHg1MywgMHg2NSB9LA0KIH07DQogDQorc3RhdGljIGNvbnN0IEdVSUQgZXh0X3N0cmVhbV9oZWFkZXIgPSB7DQorICAgIDB4MTRFNkE1Q0IsIDB4QzY3MiwgMHg0MzMyLCB7IDB4ODMsIDB4OTksIDB4QTksIDB4NjksIDB4NTIsIDB4MDYsIDB4NUIsIDB4NUEgfSwNCit9Ow0KKw0KIHN0YXRpYyBjb25zdCBHVUlEIGF1ZGlvX3N0cmVhbSA9IHsNCiAgICAgMHhGODY5OUU0MCwgMHg1QjRELCAweDExQ0YsIHsgMHhBOCwgMHhGRCwgMHgwMCwgMHg4MCwgMHg1RiwgMHg1QywgMHg0NCwgMHgyQiB9LA0KIH07DQogDQorDQorDQogc3RhdGljIGNvbnN0IEdVSUQgYXVkaW9fY29uY2VhbF9ub25lID0gew0KICAgICAvLyAweDQ5ZjFhNDQwLCAweDRlY2UsIDB4MTFkMCwgeyAweGEzLCAweGFjLCAweDAwLCAweGEwLCAweGM5LCAweDAzLCAweDQ4LCAweGY2IH0sDQogICAgIC8vIE5ldyB2YWx1ZSBsaWZ0ZWQgZnJvbSBhdmlmaWxlDQpAQCAtMjAwLDYgKzIwNiwxNCBAQA0KICAgICAgICAgMHgzMzAwMDg5MCwgMHhFNUIxLCAweDExQ0YsIHsgMHg4OSwgMHhGNCwgMHgwMCwgMHhBMCwgMHhDOSwgMHgwMywgMHg0OSwgMHhDQiB9LA0KIH07DQogDQorc3RhdGljIGNvbnN0IEdVSUQgZXh0X3N0cmVhbV9lbWJlZF9zdHJlYW1faGVhZGVyID0gew0KKyAgICAgICAgMHgzYWZiNjVlMiwgMHg0N2VmLCAweDQwZjIsIHsgMHhhYywgMHgyYywgMHg3MCwgMHhhOSwgMHgwZCwgMHg3MSwgMHhkMywgMHg0M30NCit9Ow0KKw0KK3N0YXRpYyBjb25zdCBHVUlEIGV4dF9zdHJlYW1fYXVkaW9fc3RyZWFtID0gew0KKyAgICAgICAgMHgzMTE3OGM5ZCwgMHgwM2UxLCAweDQ1MjgsIHsgMHhiNSwgMHg4MiwgMHgzZCwgMHhmOSwgMHhkYiwgMHgyMiwgMHhmNSwgMHgwM30NCit9Ow0KKw0KIC8qIEkgYW0gbm90IGEgbnVtYmVyICEhISBUaGlzIEdVSUQgaXMgdGhlIG9uZSBmb3VuZCBvbiB0aGUgUEMgdXNlZCB0bw0KICAgIGdlbmVyYXRlIHRoZSBzdHJlYW0gKi8NCiBzdGF0aWMgY29uc3QgR1VJRCBteV9ndWlkID0gew0K