Permalink
Browse files

Fixed regression in tsMuxer and H264 support

  • Loading branch information...
1 parent cfb4aa1 commit b2a95a73018fc10348024ae07fd16d97d5d5600d @shagr4th shagr4th committed Aug 13, 2013
Showing with 9 additions and 0 deletions.
  1. +1 −0 CHANGELOG.txt
  2. +8 −0 src/main/java/net/pms/dlna/DLNAMediaInfo.java
View
@@ -10,6 +10,7 @@ Changelog:
- Fix for spaces in font names breaking playback
Misc:
+ - Fixed regression with tsMuxer and H264 support
- Restored Java support for file names with special characters on Mac OS X.
1.90.0 - 2013-07-31
@@ -1188,6 +1188,14 @@ public synchronized boolean isVideoWithinH264LevelLimits(InputFile f, RendererCo
if ("h264".equals(getCodecV())) {
if (getReferenceFrameCount() > -1) {
logger.debug("H.264 file: {} level {} / ref frames {}", f.getFilename(), defaultString(getAvcLevel(), "N/A"), getReferenceFrameCount());
+
+ // shagrath : for tsmuxer to work natively with h264, we still need to retrieve some AVC header informations to emulate the h264_mp4toannexb filter in mencoder (via the H264InputStream class)
+ // I would love for mencoder to support it natively but I don't think it will ever happens
+ byte headers[][] = getAnnexBFrameHeader(f);
+ if (ffmpeg_annexb_failure) {
+ logger.info("Error parsing information from the file: " + f.getFilename());
+ } else
+ setH264AnnexB(headers[1]);
if (("4.1".equals(getAvcLevel())
|| "4.2".equals(getAvcLevel())

1 comment on commit b2a95a7

Contributor

ExSport commented on b2a95a7 Aug 14, 2013

@shagr4th : Spotted your post in forum! Can I say Welcome back Shagrath? 👍
In any case thanks for your fix:-)

Please sign in to comment.