Skip to content

Commit

Permalink
corrected bug in transcoding
Browse files Browse the repository at this point in the history
Corrected a bug that caused each transcoding block to push to all destinations, not just the destinations that were configured to use it.
  • Loading branch information
michaelkamprath committed Dec 31, 2020
1 parent 975372a commit b63b510
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Changelog
All notable changes to this project will be documented in this file.

## [Unreleased]

## [0.4.1]
### Changed
* Updated `ffmpeg` to the 4.3.x version branch

### Fixed
* Corrected bug that occurred when audio bit rated was configured in JSON using an integer
* Corrected a bug where each transcode block pushed to all destinations

## [0.4.0]
### Added
Expand Down Expand Up @@ -64,6 +64,7 @@ All notable changes to this project will be documented in this file.


[Unreleased]: https://github.com/michaelkamprath/multi-service-rtmp-broadcaster/compare/v0.4.0...HEAD
[0.4.1]: https://github.com/michaelkamprath/multi-service-rtmp-broadcaster/compare/v0.4.0...v0.4.1
[0.4.0]: https://github.com/michaelkamprath/multi-service-rtmp-broadcaster/compare/v0.3.1...v0.4.0
[0.3.1]: https://github.com/michaelkamprath/multi-service-rtmp-broadcaster/compare/v0.3.0...v0.3.1
[0.3.0]: https://github.com/michaelkamprath/multi-service-rtmp-broadcaster/compare/v0.2.0...v0.3.0
Expand Down
9 changes: 5 additions & 4 deletions multistreaming-server/rtmp-conf-generator.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/usr/bin/env python3

import copy
import jinja2
import json
import os
import re
import sys
import os
import jinja2

#
# Configurable ENV VARS
Expand Down Expand Up @@ -43,7 +44,6 @@
'keyFrames': 60,
'audioOpts': '-c:a copy',
'logFfmpeg': True if CONFIG_FFMPEG_LOG else False,
'applicationEndpoints': set(),
'maxMuxingQueueSize': int(CONFIG_FFMPEG_MAX_MUXING_QUEUE_SIZE)
if CONFIG_FFMPEG_MAX_MUXING_QUEUE_SIZE
else None,
Expand Down Expand Up @@ -118,9 +118,10 @@ def generateTranscodeConfig(transcode_config_name, block_config, config):
)
exit(1)
transcode_config = {
key: transcode_config_block.get(key, DEFAULT_TRANSCODE_CONFIG[key])
key: copy.deepcopy(transcode_config_block.get(key, DEFAULT_TRANSCODE_CONFIG[key]))
for key in default_transcode_config.keys()
}
transcode_config['applicationEndpoints'] = set()

if 'videoKeyFrameSecs' in transcode_config_block:
transcode_config['keyFrames'] = 30 * transcode_config_block['videoKeyFrameSecs']
Expand Down

0 comments on commit b63b510

Please sign in to comment.