Isaac Connor
|
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 |
|
Isaac Connor
|
76fd32b427
|
more debug, and ensure that pts != AV_NOPTS_VALUE
|
2019-10-22 10:01:24 -04:00 |
|
Isaac Connor
|
dfe2f55ebe
|
More debugging to figure out #2720
|
2019-10-20 13:50:24 -04:00 |
|
Isaac Connor
|
d9d91c4a8d
|
Fix #2728 by resetting the frame size before reading from the fifo
|
2019-10-20 13:32:16 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
7068769a90
|
zm_send_packet_receive_frame sends 0 as success
|
2019-10-18 13:52:07 -04:00 |
|
Isaac Connor
|
6a56de41f0
|
fix parameter order
|
2019-10-18 13:39:52 -04:00 |
|
Isaac Connor
|
17a7d02275
|
fix reversal of in_frame/out_frame in VideoStore destructor
|
2019-10-18 10:16:18 -04:00 |
|
Isaac Connor
|
60ec545683
|
fix compile warning due to snprintf into a too small char array
|
2019-10-18 09:43:25 -04:00 |
|
Isaac Connor
|
a0f021ee12
|
Handle the case of flushing resampler by sending NULL
|
2019-10-17 17:37:36 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
d03de98317
|
remove carriage returns in ffmpeg log lines
|
2019-10-16 09:00:39 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
3b586a2abe
|
include stream index and packet queue size in debug message
|
2019-10-11 13:53:18 -04:00 |
|
Isaac Connor
|
30b5612691
|
fix case of sql
|
2019-09-28 12:57:00 -04:00 |
|
Isaac Connor
|
492be7cc33
|
make last_zoom last_scale last_x and last_y members of the StreamBase object instead of static vars so that we can access them in monitorStream
|
2019-09-26 13:51:49 -04:00 |
|
Isaac Connor
|
b787682fa9
|
Fix play from pause when not buffering. When change of zoom, send two paused images so that response is instant. Fix some misplaced line feeds.
|
2019-09-26 13:51:13 -04:00 |
|
Isaac Connor
|
1dda79af46
|
remove debug
|
2019-09-25 12:00:00 -04:00 |
|
Isaac Connor
|
15a1b19b42
|
spaces
|
2019-09-23 10:53:21 -04:00 |
|
Isaac Connor
|
83e477e6be
|
CaptureAndRecord in remote camera rtsp doesn't work. Remove it.
|
2019-09-23 10:52:57 -04:00 |
Isaac Connor
|
ce37fce99c
|
spacing
|
2019-09-20 08:19:57 -04:00 |
|
Isaac Connor
|
09533c19af
|
Fix %d to %s
|
2019-09-20 08:19:44 -04:00 |
|
Isaac Connor
|
17e00cec94
|
Fix setting rtsp_transport when rtsp
|
2019-09-17 14:58:16 -04:00 |
|
Isaac Connor
|
e8e29d62b2
|
Use dts instead of pts for first values
|
2019-09-17 12:53:29 -04:00 |
|
Isaac Connor
|
0d347f0cf5
|
init log early so that we create zmc_m.log instead of undef.log
|
2019-09-17 11:37:48 -04:00 |
|
Isaac Connor
|
6041616efc
|
add string_toupper function
|
2019-09-17 11:37:20 -04:00 |
|
Isaac Connor
|
33aa6abf59
|
Only open log file if we are going to write to it.
|
2019-09-17 11:36:57 -04:00 |
|
Isaac Connor
|
ecde0a7ae0
|
Add a string_toupper function
|
2019-09-17 11:11:22 -04:00 |
|
Isaac Connor
|
1a94479751
|
Cleanup/rework. Handle database connection failure. This can happen if we init logging before config reading. Default terminal log level to warning. Cleanup logInit copying the options in order to populate mLogPath from config. We can handle this in the constructor now.
|
2019-09-17 11:10:59 -04:00 |
|
Isaac Connor
|
9a3765f6aa
|
spacing and google code style
|
2019-09-17 10:31:48 -04:00 |
|
Isaac Connor
|
4509c6a239
|
Don't set rtsp options unless we are using rtsp. Should prevent everyone from reporting the warning about unsupported options. Note that I removed some extra includs that have no business in zm_ffmpeg_camera.
|
2019-09-17 10:31:31 -04:00 |
|
Isaac Connor
|
c8934dac7f
|
Remove useless debug
|
2019-09-17 10:30:00 -04:00 |
|
Isaac Connor
|
cbf9931371
|
Don't log about calling dbConnect when already connected. We make this call in zm_logger, it is just going to have to be acceptable to call it multiple times.
|
2019-09-17 10:29:30 -04:00 |
|
Isaac Connor
|
54c14b17d7
|
Spacing and google code style
|
2019-09-17 10:28:42 -04:00 |
|
Isaac Connor
|
6925a75831
|
codec not ready is not an error. Make it a debug
|
2019-09-15 18:01:38 -04:00 |
|
Isaac Connor
|
0a31a8dab6
|
Just use pts instead of tracking both first pts and first dts. Should prevent conflicts
|
2019-09-15 17:53:25 -04:00 |
|
Isaac Connor
|
675cbe8854
|
code style, add bytes per second read statistic and a code comment about the sleeping
|
2019-09-14 10:48:39 -04:00 |
|
Isaac Connor
|
306bda86c2
|
fix sws_get_delay
|
2019-09-13 21:28:43 -04:00 |
Isaac Connor
|
eafa0da06f
|
fixes, handle when audio codec isn't open in ffmpeg_camera
|
2019-09-13 16:06:25 -04:00 |
|
Isaac Connor
|
3a5d1ff3ca
|
Hack in missing bits for ubuntu trusty/libav/avresample
|
2019-09-13 15:51:35 -04:00 |
|
Isaac Connor
|
5ddd20ed1a
|
refactor code. Handle resample buffering during encoding instead of when closing file
|
2019-09-13 14:34:53 -04:00 |
|
Isaac Connor
|
701aa8d924
|
add flushing the resample buffer to get the remaining samples encoded
|
2019-09-13 10:55:30 -04:00 |
|
Isaac Connor
|
788b5b480b
|
hack to make sync work on resample
|
2019-09-12 17:59:08 -04:00 |
|
Isaac Connor
|
d9d4c6b4ca
|
fix build
|
2019-09-12 17:26:19 -04:00 |
|
Isaac Connor
|
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
|
8fb55cdbff
|
Add codec name to zm_dump_codec and zm_dump_codecpar add new functions zm_receive_packet
|
2019-09-12 16:51:33 -04:00 |
|
Isaac Connor
|
6c6b2d7c6f
|
Fix build
|
2019-09-09 17:10:40 -04:00 |
|
Isaac Connor
|
097ce5e778
|
add const to cast
|
2019-09-09 17:09:01 -04:00 |
|
Isaac Connor
|
792af28c54
|
return a value from write_packet
|
2019-09-09 16:55:22 -04:00 |
|
Isaac Connor
|
d5aa95e45f
|
cpplint fixes
|
2019-09-09 16:13:32 -04:00 |