fea2ea37e5
Cleanup unused first/start/last pts/dts
2021-01-29 14:04:50 -05:00
8199116c15
Make error message more clear
2021-01-28 10:46:08 -05:00
acf909d4f3
Move setting codec parameters below the copy in case they get overwritten
2021-01-28 10:17:23 -05:00
ce53552dda
require audio_in_ctx as well as audio_in_stream
2021-01-27 16:14:07 -05:00
7e11d28031
Remove duplicated debug
2021-01-26 12:25:11 -05:00
a209d493ef
Handle null video_in_ctx. Better debug. Always flush codecs
2021-01-26 12:24:43 -05:00
835cc8076e
Cleanup constructor, using initializers. Pass in CodecContexts as well. We need them for timebases. Fixes passthrough timestamps.
2021-01-25 18:50:35 -05:00
66c78e5a9b
Merge branch 'zma_to_thread' into rtsp_server
2021-01-19 13:43:25 -05:00
fec3dc763f
Cleanups. Apply crf to encoding to fix encoding video
2021-01-15 17:02:26 -05:00
27e10c2ed9
cleanup encoding code. Update logging
2021-01-15 11:55:46 -05:00
e530a51af7
WHen ret=0 is not failure, not success. Don't log error. Return the return code instead of -1
2021-01-14 10:31:55 -05:00
1ec2198d2b
remove unused var temp
2021-01-11 13:46:50 -05:00
1316c6ea86
Update codec opening to properly handle passthrough
2021-01-11 13:46:50 -05:00
60fa3f9ec1
cleanup. Add h264_vaapi codec support
2021-01-11 13:46:50 -05:00
4b90eb992d
remove unused var temp
2021-01-08 16:45:16 -05:00
c6d15f193a
Update codec opening to properly handle passthrough
2021-01-07 09:46:35 -05:00
b6c11538c2
cleanup. Add h264_vaapi codec support
2020-12-31 09:15:49 -05:00
6d036629d3
clean up cruft. NULL=>nullptr. Fix some codec_context allocation. Try to solve h264_encoder_close crash.
2020-12-30 21:25:12 -05:00
284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
8d52baeee2
Merge branch 'master' into rtsp_server
...
Cleanup Analysis a bit. We can't skip packets just because they are audio. Clean up the state machine transitions a bit to make them a little more readable.
Change logic of PrimeCapture, success MUST return 1. 0 means no error but also no success.
Debugging and braces improvements in local_camera.
2020-12-17 10:16:54 -05:00
fbbfb20c41
Move orientation setting down. output_stream hasn't been allocated yet so that would crash.
2020-12-15 16:54:35 -05:00
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
8f980a1168
Convert NULL/0 to nullptr
...
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
05107bb2f7
Add debug of unused options
2020-07-30 15:16:31 -04:00
d8cd4386cf
rename GetOptEncoderParams to GetOptEncoderParams to GetOptEncoderParamsVec so that we can get at the std::string if we want to.
...
Use EncoderParams when setting movflags in VideoStore.
Move the content of this option to a help popup so that we can remove the comments from it. av_dict_parse doesn't handle the hash tag as a comment.
2020-07-30 15:06:05 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
df4fab5fbf
re-enable fragmented mp4 recordings
2020-04-23 18:11:10 -04:00
ff7defa84e
re-enable fragmented mp4 recordings
2020-03-13 14:46:20 -04:00
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
50986ce3b4
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2019-11-30 13:53:05 -05:00
fdf5150a16
fix build on jessie
2019-11-13 13:51:22 -05:00
35ae81d985
dynamically allocate next_dts and use it in write_packet to store the next dts value. write_interleaved_packet destroys the passed in packet so we need to store next_dts before writing out the packet.
2019-10-23 09:25:16 -04:00
76fd32b427
more debug, and ensure that pts != AV_NOPTS_VALUE
2019-10-22 10:01:24 -04:00
dfe2f55ebe
More debugging to figure out #2720
2019-10-20 13:50:24 -04:00
d9d91c4a8d
Fix #2728 by resetting the frame size before reading from the fifo
2019-10-20 13:32:16 -04:00
21dd9b527d
when ipkt->pts is AV_NOPTS_VALUE should still set opkt.pts to AV_NOPTS_VALUE
2019-10-19 17:12:19 -04:00
17a7d02275
fix reversal of in_frame/out_frame in VideoStore destructor
2019-10-18 10:16:18 -04:00
f938fd83ac
keep track of video_next_dts. Use it when packet dts is AV_NOPTS_VALUE. Also handle EAGAIN in send_packet_get_frame etc
2019-10-16 09:01:59 -04:00
90d6e11fb9
If we try to write a packet with dts == AV_NOPTS_VALUE, set it to stream->cur_dts. This might at least give us a playable file.
2019-10-11 14:04:51 -04:00
e8e29d62b2
Use dts instead of pts for first values
2019-09-17 12:53:29 -04:00
0a31a8dab6
Just use pts instead of tracking both first pts and first dts. Should prevent conflicts
2019-09-15 17:53:25 -04:00
eafa0da06f
fixes, handle when audio codec isn't open in ffmpeg_camera
2019-09-13 16:06:25 -04:00
3a5d1ff3ca
Hack in missing bits for ubuntu trusty/libav/avresample
2019-09-13 15:51:35 -04:00
5ddd20ed1a
refactor code. Handle resample buffering during encoding instead of when closing file
2019-09-13 14:34:53 -04:00
701aa8d924
add flushing the resample buffer to get the remaining samples encoded
2019-09-13 10:55:30 -04:00
788b5b480b
hack to make sync work on resample
2019-09-12 17:59:08 -04:00
d9d4c6b4ca
fix build
2019-09-12 17:26:19 -04:00
0a8aba2b76
rework how pts/dts is handled. We still use video_first_pts, but if the result is negative, normalize it to 0. Also now use audio_next_pts/dts to calculate pts when resampling and re-encoding. I believe this resolves the issues with wrong duration in the audio stream.
2019-09-12 16:52:59 -04:00
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt
Pliable Pixels