From f597a04289ffca4778d298fa67a01b29b732ea69 Mon Sep 17 00:00:00 2001 From: Trek H Date: Tue, 9 Apr 2019 15:42:44 +0930 Subject: [PATCH 1/6] pcm: changed location to codec --- codec/pcm/pcm.go | 145 ++++++++++++++++++++++++++++++++++++++++++ codec/pcm/pcm_test.go | 118 ++++++++++++++++++++++++++++++++++ 2 files changed, 263 insertions(+) create mode 100644 codec/pcm/pcm.go create mode 100644 codec/pcm/pcm_test.go diff --git a/codec/pcm/pcm.go b/codec/pcm/pcm.go new file mode 100644 index 00000000..5ead3143 --- /dev/null +++ b/codec/pcm/pcm.go @@ -0,0 +1,145 @@ +/* +NAME + pcm.go + +DESCRIPTION + pcm.go contains functions for processing pcm. + +AUTHOR + Trek Hopton + +LICENSE + pcm.go is Copyright (C) 2019 the Australian Ocean Lab (AusOcean) + + It is free software: you can redistribute it and/or modify them + under the terms of the GNU General Public License as published by the + Free Software Foundation, either version 3 of the License, or (at your + option) any later version. + + It is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License in gpl.txt. + If not, see [GNU licenses](http://www.gnu.org/licenses). +*/ +package pcm + +import ( + "encoding/binary" + "fmt" + + "github.com/yobert/alsa" +) + +// Resample takes an alsa.Buffer (b) and resamples the pcm audio data to 'rate' Hz and returns the resulting pcm. +// If an error occurs, an error will be returned along with the original b's data. +// Notes: +// - Currently only downsampling is implemented and b's rate must be divisible by 'rate' or an error will occur. +// - If the number of bytes in b.Data is not divisible by the decimation factor (ratioFrom), the remaining bytes will +// not be included in the result. Eg. input of length 480002 downsampling 6:1 will result in output length 80000. +func Resample(b alsa.Buffer, rate int) ([]byte, error) { + fromRate := b.Format.Rate + if fromRate == rate { + return b.Data, nil + } else if fromRate < 0 { + return nil, fmt.Errorf("Unable to convert from: %v Hz", fromRate) + } else if rate < 0 { + return nil, fmt.Errorf("Unable to convert to: %v Hz", rate) + } + + // The number of bytes in a sample. + var sampleLen int + switch b.Format.SampleFormat { + case alsa.S32_LE: + sampleLen = 4 * b.Format.Channels + case alsa.S16_LE: + sampleLen = 2 * b.Format.Channels + default: + return nil, fmt.Errorf("Unhandled ALSA format: %v", b.Format.SampleFormat) + } + inPcmLen := len(b.Data) + + // Calculate sample rate ratio ratioFrom:ratioTo. + rateGcd := gcd(rate, fromRate) + ratioFrom := fromRate / rateGcd + ratioTo := rate / rateGcd + + // ratioTo = 1 is the only number that will result in an even sampling. + if ratioTo != 1 { + return nil, fmt.Errorf("unhandled from:to rate ratio %v:%v: 'to' must be 1", ratioFrom, ratioTo) + } + + newLen := inPcmLen / ratioFrom + result := make([]byte, 0, newLen) + + // For each new sample to be generated, loop through the respective 'ratioFrom' samples in 'b.Data' to add them + // up and average them. The result is the new sample. + bAvg := make([]byte, sampleLen) + for i := 0; i < newLen/sampleLen; i++ { + var sum int + for j := 0; j < ratioFrom; j++ { + switch b.Format.SampleFormat { + case alsa.S32_LE: + sum += int(int32(binary.LittleEndian.Uint32(b.Data[(i*ratioFrom*sampleLen)+(j*sampleLen) : (i*ratioFrom*sampleLen)+((j+1)*sampleLen)]))) + case alsa.S16_LE: + sum += int(int16(binary.LittleEndian.Uint16(b.Data[(i*ratioFrom*sampleLen)+(j*sampleLen) : (i*ratioFrom*sampleLen)+((j+1)*sampleLen)]))) + } + } + avg := sum / ratioFrom + switch b.Format.SampleFormat { + case alsa.S32_LE: + binary.LittleEndian.PutUint32(bAvg, uint32(avg)) + case alsa.S16_LE: + binary.LittleEndian.PutUint16(bAvg, uint16(avg)) + } + result = append(result, bAvg...) + } + return result, nil +} + +// StereoToMono returns raw mono audio data generated from only the left channel from +// the given stereo recording (ALSA buffer) +// if an error occurs, an error will be returned along with the original stereo data. +func StereoToMono(b alsa.Buffer) ([]byte, error) { + if b.Format.Channels == 1 { + return b.Data, nil + } else if b.Format.Channels != 2 { + return nil, fmt.Errorf("Audio is not stereo or mono, it has %v channels", b.Format.Channels) + } + + var stereoSampleBytes int + switch b.Format.SampleFormat { + case alsa.S32_LE: + stereoSampleBytes = 8 + case alsa.S16_LE: + stereoSampleBytes = 4 + default: + return nil, fmt.Errorf("Unhandled ALSA format %v", b.Format.SampleFormat) + } + + recLength := len(b.Data) + mono := make([]byte, recLength/2) + + // Convert to mono: for each byte in the stereo recording, if it's in the first half of a stereo sample + // (left channel), add it to the new mono audio data. + var inc int + for i := 0; i < recLength; i++ { + if i%stereoSampleBytes < stereoSampleBytes/2 { + mono[inc] = b.Data[i] + inc++ + } + } + + return mono, nil +} + +// gcd is used for calculating the greatest common divisor of two positive integers, a and b. +// assumes given a and b are positive. +func gcd(a, b int) int { + for b != 0 { + a, b = b, a%b + } + return a +} diff --git a/codec/pcm/pcm_test.go b/codec/pcm/pcm_test.go new file mode 100644 index 00000000..713d01d8 --- /dev/null +++ b/codec/pcm/pcm_test.go @@ -0,0 +1,118 @@ +/* +NAME + pcm_test.go + +DESCRIPTION + pcm_test.go contains functions for testing the pcm package. + +AUTHOR + Trek Hopton + +LICENSE + pcm_test.go is Copyright (C) 2019 the Australian Ocean Lab (AusOcean) + + It is free software: you can redistribute it and/or modify them + under the terms of the GNU General Public License as published by the + Free Software Foundation, either version 3 of the License, or (at your + option) any later version. + + It is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License in gpl.txt. + If not, see [GNU licenses](http://www.gnu.org/licenses). +*/ +package pcm + +import ( + "bytes" + "io/ioutil" + "log" + "testing" + + "github.com/yobert/alsa" +) + +// TestResample tests the Resample function using a pcm file that contains audio of a freq. sweep. +// The output of the Resample function is compared with a file containing the expected result. +func TestResample(t *testing.T) { + inPath := "../../../test/test-data/av/input/sweep_400Hz_20000Hz_-3dBFS_5s_48khz.pcm" + expPath := "../../../test/test-data/av/output/sweep_400Hz_20000Hz_resampled_48to8kHz.pcm" + + // Read input pcm. + inPcm, err := ioutil.ReadFile(inPath) + if err != nil { + log.Fatal(err) + } + + format := alsa.BufferFormat{ + Channels: 1, + Rate: 48000, + SampleFormat: alsa.S16_LE, + } + + buf := alsa.Buffer{ + Format: format, + Data: inPcm, + } + + // Resample pcm. + resampled, err := Resample(buf, 8000) + if err != nil { + log.Fatal(err) + } + + // Read expected resampled pcm. + exp, err := ioutil.ReadFile(expPath) + if err != nil { + log.Fatal(err) + } + + // Compare result with expected. + if !bytes.Equal(resampled, exp) { + t.Error("Resampled data does not match expected result.") + } +} + +// TestStereoToMono tests the StereoToMono function using a pcm file that contains stereo audio. +// The output of the StereoToMono function is compared with a file containing the expected mono audio. +func TestStereoToMono(t *testing.T) { + inPath := "../../../test/test-data/av/input/stereo_DTMF_tones.pcm" + expPath := "../../../test/test-data/av/output/mono_DTMF_tones.pcm" + + // Read input pcm. + inPcm, err := ioutil.ReadFile(inPath) + if err != nil { + log.Fatal(err) + } + + format := alsa.BufferFormat{ + Channels: 2, + Rate: 44100, + SampleFormat: alsa.S16_LE, + } + + buf := alsa.Buffer{ + Format: format, + Data: inPcm, + } + + // Convert audio. + mono, err := StereoToMono(buf) + if err != nil { + log.Fatal(err) + } + + // Read expected mono pcm. + exp, err := ioutil.ReadFile(expPath) + if err != nil { + log.Fatal(err) + } + + // Compare result with expected. + if !bytes.Equal(mono, exp) { + t.Error("Converted data does not match expected result.") + } +} From cba85c169b6f5d8cc2b4b807276ffca5ae98e1c7 Mon Sep 17 00:00:00 2001 From: Trek H Date: Tue, 9 Apr 2019 15:45:28 +0930 Subject: [PATCH 2/6] pcm: deleted files in old location --- audio/pcm/pcm.go | 145 ------------------------------------------ audio/pcm/pcm_test.go | 118 ---------------------------------- 2 files changed, 263 deletions(-) delete mode 100644 audio/pcm/pcm.go delete mode 100644 audio/pcm/pcm_test.go diff --git a/audio/pcm/pcm.go b/audio/pcm/pcm.go deleted file mode 100644 index 5ead3143..00000000 --- a/audio/pcm/pcm.go +++ /dev/null @@ -1,145 +0,0 @@ -/* -NAME - pcm.go - -DESCRIPTION - pcm.go contains functions for processing pcm. - -AUTHOR - Trek Hopton - -LICENSE - pcm.go is Copyright (C) 2019 the Australian Ocean Lab (AusOcean) - - It is free software: you can redistribute it and/or modify them - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. - - It is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License in gpl.txt. - If not, see [GNU licenses](http://www.gnu.org/licenses). -*/ -package pcm - -import ( - "encoding/binary" - "fmt" - - "github.com/yobert/alsa" -) - -// Resample takes an alsa.Buffer (b) and resamples the pcm audio data to 'rate' Hz and returns the resulting pcm. -// If an error occurs, an error will be returned along with the original b's data. -// Notes: -// - Currently only downsampling is implemented and b's rate must be divisible by 'rate' or an error will occur. -// - If the number of bytes in b.Data is not divisible by the decimation factor (ratioFrom), the remaining bytes will -// not be included in the result. Eg. input of length 480002 downsampling 6:1 will result in output length 80000. -func Resample(b alsa.Buffer, rate int) ([]byte, error) { - fromRate := b.Format.Rate - if fromRate == rate { - return b.Data, nil - } else if fromRate < 0 { - return nil, fmt.Errorf("Unable to convert from: %v Hz", fromRate) - } else if rate < 0 { - return nil, fmt.Errorf("Unable to convert to: %v Hz", rate) - } - - // The number of bytes in a sample. - var sampleLen int - switch b.Format.SampleFormat { - case alsa.S32_LE: - sampleLen = 4 * b.Format.Channels - case alsa.S16_LE: - sampleLen = 2 * b.Format.Channels - default: - return nil, fmt.Errorf("Unhandled ALSA format: %v", b.Format.SampleFormat) - } - inPcmLen := len(b.Data) - - // Calculate sample rate ratio ratioFrom:ratioTo. - rateGcd := gcd(rate, fromRate) - ratioFrom := fromRate / rateGcd - ratioTo := rate / rateGcd - - // ratioTo = 1 is the only number that will result in an even sampling. - if ratioTo != 1 { - return nil, fmt.Errorf("unhandled from:to rate ratio %v:%v: 'to' must be 1", ratioFrom, ratioTo) - } - - newLen := inPcmLen / ratioFrom - result := make([]byte, 0, newLen) - - // For each new sample to be generated, loop through the respective 'ratioFrom' samples in 'b.Data' to add them - // up and average them. The result is the new sample. - bAvg := make([]byte, sampleLen) - for i := 0; i < newLen/sampleLen; i++ { - var sum int - for j := 0; j < ratioFrom; j++ { - switch b.Format.SampleFormat { - case alsa.S32_LE: - sum += int(int32(binary.LittleEndian.Uint32(b.Data[(i*ratioFrom*sampleLen)+(j*sampleLen) : (i*ratioFrom*sampleLen)+((j+1)*sampleLen)]))) - case alsa.S16_LE: - sum += int(int16(binary.LittleEndian.Uint16(b.Data[(i*ratioFrom*sampleLen)+(j*sampleLen) : (i*ratioFrom*sampleLen)+((j+1)*sampleLen)]))) - } - } - avg := sum / ratioFrom - switch b.Format.SampleFormat { - case alsa.S32_LE: - binary.LittleEndian.PutUint32(bAvg, uint32(avg)) - case alsa.S16_LE: - binary.LittleEndian.PutUint16(bAvg, uint16(avg)) - } - result = append(result, bAvg...) - } - return result, nil -} - -// StereoToMono returns raw mono audio data generated from only the left channel from -// the given stereo recording (ALSA buffer) -// if an error occurs, an error will be returned along with the original stereo data. -func StereoToMono(b alsa.Buffer) ([]byte, error) { - if b.Format.Channels == 1 { - return b.Data, nil - } else if b.Format.Channels != 2 { - return nil, fmt.Errorf("Audio is not stereo or mono, it has %v channels", b.Format.Channels) - } - - var stereoSampleBytes int - switch b.Format.SampleFormat { - case alsa.S32_LE: - stereoSampleBytes = 8 - case alsa.S16_LE: - stereoSampleBytes = 4 - default: - return nil, fmt.Errorf("Unhandled ALSA format %v", b.Format.SampleFormat) - } - - recLength := len(b.Data) - mono := make([]byte, recLength/2) - - // Convert to mono: for each byte in the stereo recording, if it's in the first half of a stereo sample - // (left channel), add it to the new mono audio data. - var inc int - for i := 0; i < recLength; i++ { - if i%stereoSampleBytes < stereoSampleBytes/2 { - mono[inc] = b.Data[i] - inc++ - } - } - - return mono, nil -} - -// gcd is used for calculating the greatest common divisor of two positive integers, a and b. -// assumes given a and b are positive. -func gcd(a, b int) int { - for b != 0 { - a, b = b, a%b - } - return a -} diff --git a/audio/pcm/pcm_test.go b/audio/pcm/pcm_test.go deleted file mode 100644 index 713d01d8..00000000 --- a/audio/pcm/pcm_test.go +++ /dev/null @@ -1,118 +0,0 @@ -/* -NAME - pcm_test.go - -DESCRIPTION - pcm_test.go contains functions for testing the pcm package. - -AUTHOR - Trek Hopton - -LICENSE - pcm_test.go is Copyright (C) 2019 the Australian Ocean Lab (AusOcean) - - It is free software: you can redistribute it and/or modify them - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. - - It is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License in gpl.txt. - If not, see [GNU licenses](http://www.gnu.org/licenses). -*/ -package pcm - -import ( - "bytes" - "io/ioutil" - "log" - "testing" - - "github.com/yobert/alsa" -) - -// TestResample tests the Resample function using a pcm file that contains audio of a freq. sweep. -// The output of the Resample function is compared with a file containing the expected result. -func TestResample(t *testing.T) { - inPath := "../../../test/test-data/av/input/sweep_400Hz_20000Hz_-3dBFS_5s_48khz.pcm" - expPath := "../../../test/test-data/av/output/sweep_400Hz_20000Hz_resampled_48to8kHz.pcm" - - // Read input pcm. - inPcm, err := ioutil.ReadFile(inPath) - if err != nil { - log.Fatal(err) - } - - format := alsa.BufferFormat{ - Channels: 1, - Rate: 48000, - SampleFormat: alsa.S16_LE, - } - - buf := alsa.Buffer{ - Format: format, - Data: inPcm, - } - - // Resample pcm. - resampled, err := Resample(buf, 8000) - if err != nil { - log.Fatal(err) - } - - // Read expected resampled pcm. - exp, err := ioutil.ReadFile(expPath) - if err != nil { - log.Fatal(err) - } - - // Compare result with expected. - if !bytes.Equal(resampled, exp) { - t.Error("Resampled data does not match expected result.") - } -} - -// TestStereoToMono tests the StereoToMono function using a pcm file that contains stereo audio. -// The output of the StereoToMono function is compared with a file containing the expected mono audio. -func TestStereoToMono(t *testing.T) { - inPath := "../../../test/test-data/av/input/stereo_DTMF_tones.pcm" - expPath := "../../../test/test-data/av/output/mono_DTMF_tones.pcm" - - // Read input pcm. - inPcm, err := ioutil.ReadFile(inPath) - if err != nil { - log.Fatal(err) - } - - format := alsa.BufferFormat{ - Channels: 2, - Rate: 44100, - SampleFormat: alsa.S16_LE, - } - - buf := alsa.Buffer{ - Format: format, - Data: inPcm, - } - - // Convert audio. - mono, err := StereoToMono(buf) - if err != nil { - log.Fatal(err) - } - - // Read expected mono pcm. - exp, err := ioutil.ReadFile(expPath) - if err != nil { - log.Fatal(err) - } - - // Compare result with expected. - if !bytes.Equal(mono, exp) { - t.Error("Converted data does not match expected result.") - } -} From 8e9cbd5a7917b42e58d28c157f555b2d333f2dc9 Mon Sep 17 00:00:00 2001 From: Trek H Date: Tue, 9 Apr 2019 15:48:54 +0930 Subject: [PATCH 3/6] pcm: updated import statements using pcm --- exp/pcm/resample/resample.go | 2 +- exp/pcm/stereo-to-mono/stereo-to-mono.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exp/pcm/resample/resample.go b/exp/pcm/resample/resample.go index aaa8f77c..eab7a342 100644 --- a/exp/pcm/resample/resample.go +++ b/exp/pcm/resample/resample.go @@ -32,7 +32,7 @@ import ( "io/ioutil" "log" - "bitbucket.org/ausocean/av/audio/pcm" + "bitbucket.org/ausocean/av/codec/pcm" "github.com/yobert/alsa" ) diff --git a/exp/pcm/stereo-to-mono/stereo-to-mono.go b/exp/pcm/stereo-to-mono/stereo-to-mono.go index 231591f0..ccbf87bf 100644 --- a/exp/pcm/stereo-to-mono/stereo-to-mono.go +++ b/exp/pcm/stereo-to-mono/stereo-to-mono.go @@ -32,7 +32,7 @@ import ( "io/ioutil" "log" - "bitbucket.org/ausocean/av/audio/pcm" + "bitbucket.org/ausocean/av/codec/pcm" "github.com/yobert/alsa" ) From af32f13932b7b1edccb97e117aa000cbe195eeaa Mon Sep 17 00:00:00 2001 From: scruzin Date: Wed, 10 Apr 2019 16:04:18 +0930 Subject: [PATCH 4/6] Removed obsolete directory. --- startup/rc.local | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100755 startup/rc.local diff --git a/startup/rc.local b/startup/rc.local deleted file mode 100755 index 7d39ed7c..00000000 --- a/startup/rc.local +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -e -# -# rc.local -# -# This script is executed at the end of each multiuser runlevel. -# Make sure that the script will "exit 0" on success or any other -# value on error. -# -# In order to enable or disable this script just change the execution -# bits. -# -# By default this script does nothing. - -# Print the IP address -_IP=$(hostname -I) || true -if [ "$_IP" ]; then - printf "My IP address is %s\n" "$_IP" -fi - -exit 0 From d4c6a8f2a3e03f221692c734d817bae0ac5be07b Mon Sep 17 00:00:00 2001 From: scruzin Date: Wed, 10 Apr 2019 16:06:36 +0930 Subject: [PATCH 5/6] Removed as grossly out of date. --- revid/Readme.md | 112 ------------------------------------------------ 1 file changed, 112 deletions(-) delete mode 100644 revid/Readme.md diff --git a/revid/Readme.md b/revid/Readme.md deleted file mode 100644 index a3c3d4e8..00000000 --- a/revid/Readme.md +++ /dev/null @@ -1,112 +0,0 @@ -# Readme - -revid is a testbed for re-muxing and re-directing video streams as -MPEG-TS over various protocols. - -# Description - -The mode (-m) determine the mode of operation: - -* h = send HTTP (as a POST) -* u = send UDP -* r = send RTP -* f = write to /tmp files -* d = inspect packets and dump to screen - -Flags (-f) determine video filtering and other actions. - -For example, to send as raw UDP to on the current host, passing the video and audio as is: - -revid -i -m u -o udp://0.0.0.0: - -Or, to post as HTTP to , fixing PTS and dropping the audio along the way: - -revid -i -m h -f 3 -o - -Note that revid appends the size of the video to the URL to supply a query param. -Append a ? to your if you don't need it - -List of flags: - -* filterFixPTS = 0x0001 -* filterDropAudio = 0x0002 -* filterScale640 = 0x0004 -* filterScale320 = 0x0008 -* filterFixContinuity = 0x0010 -* dumpProgramInfo = 0x0100 -* dumpPacketStats = 0x0200 -* dumpPacketHeader = 0x0400 -* dumpPacketPayload = 0x0800 - -Common flag combos: - -* 3: fix pts and drop audio -* 7: fix pts, drop audo and scale 640 -* 17: fix pts and fix continuity -* 256: dump program info -* 512: dump packet stats -* 513: fix pts, plus above -* 529: fix pts and fix continuity, plus above - -# Errors - -If you see "Error reading from ffmpeg: EOF" that means ffmpeg has -crashed for some reason, usually because of a bad parameter. Copy and -paste the ffmpeg command line into a terminal to see what is -happening. - -RTSP feeds from certain cameras (such as TechView ones) do not -generate presentation timestamps (PTS), resulting in errors such as -the following: - -* [mpegts @ 0xX] Timestamps are unset in a packet for stream 0... -* [mpegts @ 0xX] first pts value must be set - -This can be fixed with an ffmpeg video filter (specified by flag 0x0001). -Another issue is that MPEG-TS continuity counters may not be continuous. -You can fix this with the fix continuity flag (0x0010). - -FFmpeg will also complain if doesn't have the necessary audio codec -installed. If so, you can drop the audio (flag 0x0002). - -# MPEG-TS Notes - -MPEG2-TS stream clocks (PCR, PTS, and DTS) all have units of 1/90000 -second and header fields are read as big endian (like most protocols). - -* TEI = Transport Error Indicator -* PUSI = Payload Unit Start Indicator -* TP = Transport Priority -* TCS = Transport Scrambling Control -* AFC = Adapation Field Control -* CC = Continuity Counter (incremented per PID wen payload present) -* AFL = Adapation Field Length -* PCR = Program Clock Reference - -# Dependencies - -revid uses ffmpeg for video remuxing. -See [Ffmepg filters](https://ffmpeg.org/ffmpeg-filters.html). - -revid also uses [Comcast's gots package](https://github.com/Comcast/gots). - -# Author - -Alan Noble - -# License - -Revid is Copyright (C) 2017 the Australian Ocean Lab (AusOcean). - -It is free software: you can redistribute it and/or modify them -under the terms of the GNU General Public License as published by the -Free Software Foundation, either version 3 of the License, or (at your -option) any later version. - -It is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -or more details. - -You should have received a copy of the GNU General Public License -along with revid in gpl.txt. If not, see [GNU licenses](http://www.gnu.org/licenses/). From 863db58a843bd47b7c4745334032785e9f4e6d89 Mon Sep 17 00:00:00 2001 From: scruzin Date: Wed, 10 Apr 2019 16:32:07 +0930 Subject: [PATCH 6/6] Removed references to obsolete Session. --- protocol/rtmp/packet.go | 2 +- protocol/rtmp/rtmp_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/protocol/rtmp/packet.go b/protocol/rtmp/packet.go index 5f46851d..dda53d35 100644 --- a/protocol/rtmp/packet.go +++ b/protocol/rtmp/packet.go @@ -259,7 +259,7 @@ func (pkt *packet) resize(size uint32, ht uint8) { } // writeTo writes a packet to the RTMP connection. -// Packets are written in chunks which are Session.chunkSize in length (128 bytes in length). +// Packets are written in chunks which are c.chunkSize in length (128 bytes by default). // We defer sending small audio packets and combine consecutive small audio packets where possible to reduce I/O. // When queue is true, we expect a response to this request and cache the method on c.methodCalls. func (pkt *packet) writeTo(c *Conn, queue bool) error { diff --git a/protocol/rtmp/rtmp_test.go b/protocol/rtmp/rtmp_test.go index 8ccb2e12..f2d661c5 100644 --- a/protocol/rtmp/rtmp_test.go +++ b/protocol/rtmp/rtmp_test.go @@ -206,7 +206,7 @@ func TestFromFrame(t *testing.T) { err = c.Close() if err != nil { - t.Errorf("Session.Close failed with error: %v", err) + t.Errorf("Conn.Close failed with error: %v", err) } } @@ -256,6 +256,6 @@ func TestFromFile(t *testing.T) { err = c.Close() if err != nil { - t.Errorf("Session.Close failed with error: %v", err) + t.Errorf("Conn.Close failed with error: %v", err) } }